780 files changed, 198041 insertions, 0 deletions

diff --git a/org.eclipse.emf.refactor.comrel.diagram/.classpath b/org.eclipse.emf.refactor.comrel.diagram/.classpath
new file mode 100644
index 0000000..ed2bc12
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/org.eclipse.emf.refactor.comrel.diagram/.options b/org.eclipse.emf.refactor.comrel.diagram/.options
new file mode 100644
index 0000000..1876dbf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/.options
@@ -0,0 +1,7 @@
+# Tracing options for the comrel.diagram plug-in
+
+# Common issues
+comrel.diagram/debug=false
+
+# Visual IDs
+comrel.diagram/debug/visualID=false
diff --git a/org.eclipse.emf.refactor.comrel.diagram/.project b/org.eclipse.emf.refactor.comrel.diagram/.project
new file mode 100644
index 0000000..8d53851
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.emf.refactor.comrel.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/org.eclipse.emf.refactor.comrel.diagram/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.comrel.diagram/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..738d725
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/META-INF/MANIFEST.MF
@@ -0,0 +1,44 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: CoMReL Diagram

+Bundle-SymbolicName: org.eclipse.emf.refactor.comrel.diagram;singleton:=true

+Bundle-Version: 0.9.0

+Bundle-ClassPath: .

+Bundle-Activator: comrel.diagram.part.ComrelDiagramEditorPlugin

+Bundle-Localization: plugin

+Export-Package: comrel.diagram.edit.parts,

+ comrel.diagram.part,

+ comrel.diagram.providers

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.core.resources,

+ org.eclipse.core.expressions,

+ org.eclipse.jface,

+ org.eclipse.ui.ide,

+ org.eclipse.ui.views,

+ org.eclipse.ui.navigator,

+ org.eclipse.ui.navigator.resources,

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.ecore.xmi,

+ org.eclipse.emf.edit.ui,

+ org.eclipse.gmf.runtime.emf.core,

+ org.eclipse.gmf.runtime.emf.commands.core,

+ org.eclipse.gmf.runtime.emf.ui.properties,

+ org.eclipse.gmf.runtime.diagram.ui,

+ org.eclipse.gmf.runtime.diagram.ui.printing,

+ org.eclipse.gmf.runtime.diagram.ui.printing.render,

+ org.eclipse.gmf.runtime.diagram.ui.properties,

+ org.eclipse.gmf.runtime.diagram.ui.providers,

+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,

+ org.eclipse.gmf.runtime.diagram.ui.render,

+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,

+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

+ org.eclipse.draw2d;visibility:=reexport,

+ org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,

+ org.eclipse.emf.refactor.comrel;visibility:=reexport,

+ org.eclipse.emf.refactor.comrel.edit;visibility:=reexport,

+ org.eclipse.emf.validation;visibility:=reexport,

+ org.eclipse.gef;visibility:=reexport,

+ org.eclipse.emf.validation.ocl;bundle-version="1.4.0",

+ org.eclipse.ocl.ecore;bundle-version="3.0.2"

+Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/org.eclipse.emf.refactor.comrel.diagram/bin/.gitignore b/org.eclipse.emf.refactor.comrel.diagram/bin/.gitignore
new file mode 100644
index 0000000..508dbce
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/bin/.gitignore
@@ -0,0 +1 @@
+/comrel
diff --git a/org.eclipse.emf.refactor.comrel.diagram/build.properties b/org.eclipse.emf.refactor.comrel.diagram/build.properties
new file mode 100644
index 0000000..311ca94
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/build.properties
@@ -0,0 +1,12 @@
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               messages.properties,\
+               .options,\
+               src/,\
+               bin/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/incomingLinksNavigatorGroup.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/incomingLinksNavigatorGroup.gif
new file mode 100644
index 0000000..fca9c53
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/incomingLinksNavigatorGroup.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/linkSourceNavigatorGroup.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/linkSourceNavigatorGroup.gif
new file mode 100644
index 0000000..fca9c53
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/linkSourceNavigatorGroup.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/linkTargetNavigatorGroup.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/linkTargetNavigatorGroup.gif
new file mode 100644
index 0000000..fca9c53
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/linkTargetNavigatorGroup.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/linksNavigatorGroup.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/linksNavigatorGroup.gif
new file mode 100644
index 0000000..fca9c53
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/linksNavigatorGroup.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/obj16/ComrelDiagramFile.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/obj16/ComrelDiagramFile.gif
new file mode 100644
index 0000000..a79ad18
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/obj16/ComrelDiagramFile.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/outgoingLinksNavigatorGroup.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/outgoingLinksNavigatorGroup.gif
new file mode 100644
index 0000000..fca9c53
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/outgoingLinksNavigatorGroup.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/shortcut.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/shortcut.gif
new file mode 100644
index 0000000..c8ebb31
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/shortcut.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/icons/wizban/NewComrelWizard.gif b/org.eclipse.emf.refactor.comrel.diagram/icons/wizban/NewComrelWizard.gif
new file mode 100644
index 0000000..cbb22aa
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/icons/wizban/NewComrelWizard.gif
diff --git a/org.eclipse.emf.refactor.comrel.diagram/messages.properties b/org.eclipse.emf.refactor.comrel.diagram/messages.properties
new file mode 100644
index 0000000..c727f50
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/messages.properties
@@ -0,0 +1,259 @@
+
+# TODO: manually put keys and values
+ComrelCreationWizardTitle=New Comrel Diagram
+ComrelCreationWizard_DiagramModelFilePageTitle=Create Comrel Diagram
+ComrelCreationWizard_DiagramModelFilePageDescription=Select file that will contain diagram model.
+ComrelCreationWizard_DomainModelFilePageTitle=Create Comrel Domain Model
+ComrelCreationWizard_DomainModelFilePageDescription=Select file that will contain domain model.
+ComrelCreationWizardOpenEditorError=Error opening diagram editor
+ComrelCreationWizardCreationError=Creation Problems
+ComrelCreationWizardPageExtensionError=File name should have {0} extension.
+ComrelDiagramEditorUtil_OpenModelResourceErrorDialogTitle=Error
+ComrelDiagramEditorUtil_OpenModelResourceErrorDialogMessage=Failed to load model file {0}
+ComrelDiagramEditorUtil_CreateDiagramProgressTask=Creating diagram and model files
+ComrelDiagramEditorUtil_CreateDiagramCommandLabel=Creating diagram and model
+ComrelDocumentProvider_isModifiable=Updating cache failed
+ComrelDocumentProvider_handleElementContentChanged=Failed to refresh hierarchy for changed resource
+ComrelDocumentProvider_IncorrectInputError={1}
+ComrelDocumentProvider_NoDiagramInResourceError=Diagram is not present in resource
+ComrelDocumentProvider_DiagramLoadingError=Error loading diagram
+ComrelDocumentProvider_UnsynchronizedFileSaveError=The file has been changed on the file system
+ComrelDocumentProvider_SaveDiagramTask=Saving diagram
+ComrelDocumentProvider_SaveNextResourceTask=Saving {0}
+ComrelDocumentProvider_SaveAsOperation=Saving {0} diagram as
+InitDiagramFile_ResourceErrorDialogTitle=Error
+InitDiagramFile_ResourceErrorDialogMessage=Model file loading failed
+InitDiagramFile_WizardTitle=Initialize new {0} diagram file
+InitDiagramFile_OpenModelFileDialogTitle=Select domain model
+ComrelNewDiagramFileWizard_CreationPageName=Initialize new diagram file
+ComrelNewDiagramFileWizard_CreationPageTitle=Diagram file
+ComrelNewDiagramFileWizard_CreationPageDescription=Create new diagram based on {0} model content
+ComrelNewDiagramFileWizard_RootSelectionPageName=Select diagram root element
+ComrelNewDiagramFileWizard_RootSelectionPageTitle=Diagram root element
+ComrelNewDiagramFileWizard_RootSelectionPageDescription=Select semantic model element to be depicted on diagram
+ComrelNewDiagramFileWizard_RootSelectionPageSelectionTitle=Select diagram root element:
+ComrelNewDiagramFileWizard_RootSelectionPageNoSelectionMessage=Diagram root element is not selected
+ComrelNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage=Invalid diagram root element is selected
+ComrelNewDiagramFileWizard_InitDiagramCommand=Initializing diagram contents
+ComrelNewDiagramFileWizard_IncorrectRootError=Incorrect model object stored as a root resource object
+ComrelDiagramEditor_SavingDeletedFile=The original file "{0}" has been deleted.
+ComrelDiagramEditor_SaveAsErrorTitle=Problem During Save As...
+ComrelDiagramEditor_SaveAsErrorMessage=Save could not be completed. Target file is already open in another editor.
+ComrelDiagramEditor_SaveErrorTitle=Save Problems
+ComrelDiagramEditor_SaveErrorMessage=Could not save file.
+ComrelElementChooserDialog_SelectModelElementTitle=Select model element
+ModelElementSelectionPageMessage=Select model element:
+ValidateActionMessage=Validate
+Objects1Group_title=Objects
+Connections2Group_title=Connections
+AtomicUnit1CreationTool_title=AtomicUnit
+AtomicUnit1CreationTool_desc=Create new AtomicUnit
+CartesianQueuedUnit2CreationTool_title=CartesianQueuedUnit
+CartesianQueuedUnit2CreationTool_desc=Create new CartesianQueuedUnit
+ConditionCheck3CreationTool_title=ConditionCheck
+ConditionCheck3CreationTool_desc=Create new ConditionCheck
+ConditionalUnit4CreationTool_title=ConditionalUnit
+ConditionalUnit4CreationTool_desc=Create new ConditionalUnit
+MultiFeatureUnit5CreationTool_title=MultiFeatureUnit
+MultiFeatureUnit5CreationTool_desc=Create new MultiFeatureUnit
+MultiFilterUnit6CreationTool_title=MultiFilterUnit
+MultiFilterUnit6CreationTool_desc=Create new MultiFilterUnit
+MultiInputPort7CreationTool_title=MultiInputPort
+MultiInputPort7CreationTool_desc=Create new MultiInputPort
+MultiOutputPort8CreationTool_title=MultiOutputPort
+MultiOutputPort8CreationTool_desc=Create new MultiOutputPort
+ParallelQueuedUnit9CreationTool_title=ParallelQueuedUnit
+ParallelQueuedUnit9CreationTool_desc=Create new ParallelQueuedUnit
+SequentialUnit10CreationTool_title=SequentialUnit
+SequentialUnit10CreationTool_desc=Create new SequentialUnit
+SingleFeatureUnit11CreationTool_title=SingleFeatureUnit
+SingleFeatureUnit11CreationTool_desc=Create new SingleFeatureUnit
+SingleFilterUnit12CreationTool_title=SingleFilterUnit
+SingleFilterUnit12CreationTool_desc=Create new SingleFilterUnit
+SingleInputPort13CreationTool_title=SingleInputPort
+SingleInputPort13CreationTool_desc=Create new SingleInputPort
+SingleOutputPort14CreationTool_title=SingleOutputPort
+SingleOutputPort14CreationTool_desc=Create new SingleOutputPort
+SingleQueuedUnit15CreationTool_title=SingleQueuedUnit
+SingleQueuedUnit15CreationTool_desc=Create new SingleQueuedUnit
+MultiPortMapping1CreationTool_title=MultiPortMapping
+MultiPortMapping1CreationTool_desc=Create new MultiPortMapping
+MultiSinglePortMapping2CreationTool_title=MultiSinglePortMapping
+MultiSinglePortMapping2CreationTool_desc=Create new MultiSinglePortMapping
+SinglePortMapping3CreationTool_title=SinglePortMapping
+SinglePortMapping3CreationTool_desc=Create new SinglePortMapping
+CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart_title=CartesianQueuedUnitHelperUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart_title=CartesianQueuedUnitRefactoringUnitCompartment
+CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart_title=CartesianQueuedUnitHelperUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart_title=CartesianQueuedUnitRefactoringUnitCompartment
+ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart_title=ParallelQueuedUnitHelperUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart_title=ParallelQueuedUnitRefactoringUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart_title=CartesianQueuedUnitHelperUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart_title=CartesianQueuedUnitRefactoringUnitCompartment
+SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart_title=SingleQueuedUnitHelperUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart_title=SingleQueuedUnitRefactoringUnitCompartment
+CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart_title=CartesianQueuedUnitHelperUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart_title=CartesianQueuedUnitRefactoringUnitCompartment
+SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart_title=SequentialUnitHelperUnitsCompartment
+SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart_title=SequentialUnitRefactoringUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart_title=CartesianQueuedUnitHelperUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart_title=CartesianQueuedUnitRefactoringUnitCompartment
+ConditionalUnitConditionalUnitIfCompartmentEditPart_title=ConditionalUnitIfCompartment
+ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart_title=ConditionalUnitHelperUnitsCompartment
+ConditionalUnitConditionalUnitThenCompartmentEditPart_title=ConditionalUnitThenCompartment
+ConditionalUnitConditionalUnitElseCompartmentEditPart_title=ConditionalUnitElseCompartment
+CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart_title=CartesianQueuedUnitHelperUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart_title=CartesianQueuedUnitRefactoringUnitCompartment
+ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart_title=ParallelQueuedUnitHelperUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart_title=ParallelQueuedUnitRefactoringUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart_title=ParallelQueuedUnitHelperUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart_title=ParallelQueuedUnitRefactoringUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart_title=SingleQueuedUnitHelperUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart_title=SingleQueuedUnitRefactoringUnitCompartment
+ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart_title=ParallelQueuedUnitHelperUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart_title=ParallelQueuedUnitRefactoringUnitsCompartment
+SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart_title=SequentialUnitHelperUnitsCompartment
+SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart_title=SequentialUnitRefactoringUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart_title=ParallelQueuedUnitHelperUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart_title=ParallelQueuedUnitRefactoringUnitsCompartment
+ConditionalUnitConditionalUnitIfCompartment2EditPart_title=ConditionalUnitIfCompartment
+ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart_title=ConditionalUnitHelperUnitsCompartment
+ConditionalUnitConditionalUnitThenCompartment2EditPart_title=ConditionalUnitThenCompartment
+ConditionalUnitConditionalUnitElseCompartment2EditPart_title=ConditionalUnitElseCompartment
+CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart_title=CartesianQueuedUnitHelperUnitsCompartment
+CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart_title=CartesianQueuedUnitRefactoringUnitCompartment
+ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart_title=ParallelQueuedUnitHelperUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart_title=ParallelQueuedUnitRefactoringUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart_title=SingleQueuedUnitHelperUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart_title=SingleQueuedUnitRefactoringUnitCompartment
+SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart_title=SingleQueuedUnitHelperUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart_title=SingleQueuedUnitRefactoringUnitCompartment
+SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart_title=SequentialUnitHelperUnitsCompartment
+SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart_title=SequentialUnitRefactoringUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart_title=SingleQueuedUnitHelperUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart_title=SingleQueuedUnitRefactoringUnitCompartment
+ConditionalUnitConditionalUnitIfCompartment3EditPart_title=ConditionalUnitIfCompartment
+ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart_title=ConditionalUnitHelperUnitsCompartment
+ConditionalUnitConditionalUnitThenCompartment3EditPart_title=ConditionalUnitThenCompartment
+ConditionalUnitConditionalUnitElseCompartment3EditPart_title=ConditionalUnitElseCompartment
+SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart_title=SingleQueuedUnitHelperUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart_title=SingleQueuedUnitRefactoringUnitCompartment
+SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart_title=SequentialUnitHelperUnitsCompartment
+SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart_title=SequentialUnitRefactoringUnitsCompartment
+SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart_title=SequentialUnitHelperUnitsCompartment
+SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart_title=SequentialUnitRefactoringUnitsCompartment
+ConditionalUnitConditionalUnitIfCompartment4EditPart_title=ConditionalUnitIfCompartment
+ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart_title=ConditionalUnitHelperUnitsCompartment
+ConditionalUnitConditionalUnitThenCompartment4EditPart_title=ConditionalUnitThenCompartment
+ConditionalUnitConditionalUnitElseCompartment4EditPart_title=ConditionalUnitElseCompartment
+ConditionalUnitConditionalUnitIfCompartment5EditPart_title=ConditionalUnitIfCompartment
+ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart_title=ConditionalUnitHelperUnitsCompartment
+ConditionalUnitConditionalUnitThenCompartment5EditPart_title=ConditionalUnitThenCompartment
+ConditionalUnitConditionalUnitElseCompartment5EditPart_title=ConditionalUnitElseCompartment
+SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart_title=SequentialUnitHelperUnitsCompartment
+SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart_title=SequentialUnitRefactoringUnitsCompartment
+ConditionalUnitConditionalUnitIfCompartment6EditPart_title=ConditionalUnitIfCompartment
+ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart_title=ConditionalUnitHelperUnitsCompartment
+ConditionalUnitConditionalUnitThenCompartment6EditPart_title=ConditionalUnitThenCompartment
+ConditionalUnitConditionalUnitElseCompartment6EditPart_title=ConditionalUnitElseCompartment
+ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart_title=ParallelQueuedUnitHelperUnitsCompartment
+ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart_title=ParallelQueuedUnitRefactoringUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart_title=SingleQueuedUnitHelperUnitsCompartment
+SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart_title=SingleQueuedUnitRefactoringUnitCompartment
+SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart_title=SequentialUnitHelperUnitsCompartment
+SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart_title=SequentialUnitRefactoringUnitsCompartment
+ConditionalUnitConditionalUnitIfCompartment7EditPart_title=ConditionalUnitIfCompartment
+ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart_title=ConditionalUnitHelperUnitsCompartment
+ConditionalUnitConditionalUnitThenCompartment7EditPart_title=ConditionalUnitThenCompartment
+ConditionalUnitConditionalUnitElseCompartment7EditPart_title=ConditionalUnitElseCompartment
+
+CommandName_OpenDiagram=Open Diagram
+NavigatorGroupName_MultiInputPort_3017_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3017_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_3035_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3035_outgoinglinks=outgoing links
+NavigatorGroupName_MultiInputPort_3032_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3032_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_3013_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3013_outgoinglinks=outgoing links
+NavigatorGroupName_MultiInputPort_3024_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3024_outgoinglinks=outgoing links
+NavigatorGroupName_MultiPortMapping_4002_target=target
+NavigatorGroupName_MultiPortMapping_4002_source=source
+NavigatorGroupName_MultiInputPort_3020_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3020_outgoinglinks=outgoing links
+NavigatorGroupName_SingleOutputPort_3018_outgoinglinks=outgoing links
+NavigatorGroupName_SinglePortMapping_4001_target=target
+NavigatorGroupName_SinglePortMapping_4001_source=source
+NavigatorGroupName_MultiInputPort_3010_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3010_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_3023_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3023_outgoinglinks=outgoing links
+NavigatorGroupName_MultiOutputPort_3015_outgoinglinks=outgoing links
+NavigatorGroupName_SingleOutputPort_3011_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_3005_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3005_outgoinglinks=outgoing links
+NavigatorGroupName_MultiInputPort_3002_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3002_outgoinglinks=outgoing links
+NavigatorGroupName_MultiInputPort_3006_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3006_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_3031_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3031_outgoinglinks=outgoing links
+NavigatorGroupName_MultiOutputPort_3021_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_2001_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_2001_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_3009_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3009_outgoinglinks=outgoing links
+NavigatorGroupName_CompositeRefactoring_1000_links=links
+NavigatorGroupName_SingleInputPort_3027_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3027_outgoinglinks=outgoing links
+NavigatorGroupName_SingleInputPort_3001_incominglinks=incoming links
+NavigatorGroupName_SingleInputPort_3001_outgoinglinks=outgoing links
+NavigatorGroupName_MultiInputPort_3028_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3028_outgoinglinks=outgoing links
+NavigatorGroupName_MultiSinglePortMapping_4003_target=target
+NavigatorGroupName_MultiSinglePortMapping_4003_source=source
+NavigatorGroupName_MultiInputPort_3014_incominglinks=incoming links
+NavigatorGroupName_MultiInputPort_3014_outgoinglinks=outgoing links
+NavigatorActionProvider_OpenDiagramActionName=Open Diagram
+AbstractParser_UnexpectedValueType=Value of type {0} is expected
+AbstractParser_WrongStringConversion=String value does not convert to {0} value
+AbstractParser_UnknownLiteral=Unknown literal: {0}
+
+MessageFormatParser_InvalidInputError=Invalid input at {0}
+ComrelModelingAssistantProviderTitle=Select domain model element
+ComrelModelingAssistantProviderMessage=Available domain model elements:
+CompositeUnits1Group_title=Composite Units
+AtomicUnits2Group_title=Atomic Units
+FilterUnits3Group_title=Filter Units
+FeatureUnits4Group_title=Feature Units
+Ports5Group_title=Ports
+Mappings6Group_title=Mappings
+CartesianQueuedUnit1CreationTool_title=CartesianQueuedUnit
+CartesianQueuedUnit1CreationTool_desc=Create new CartesianQueuedUnit
+ConditionCheck2CreationTool_title=ConditionCheck
+ConditionCheck2CreationTool_desc=Create new ConditionCheck
+ConditionalUnit3CreationTool_title=ConditionalUnit
+ConditionalUnit3CreationTool_desc=Create new ConditionalUnit
+ParallelQueuedUnit4CreationTool_title=ParallelQueuedUnit
+ParallelQueuedUnit4CreationTool_desc=Create new ParallelQueuedUnit
+SequentialUnit5CreationTool_title=SequentialUnit
+SequentialUnit5CreationTool_desc=Create new SequentialUnit
+SingleQueuedUnit6CreationTool_title=SingleQueuedUnit
+SingleQueuedUnit6CreationTool_desc=Create new SingleQueuedUnit
+MultiFilterUnit1CreationTool_title=MultiFilterUnit
+MultiFilterUnit1CreationTool_desc=Create new MultiFilterUnit
+SingleFilterUnit2CreationTool_title=SingleFilterUnit
+SingleFilterUnit2CreationTool_desc=Create new SingleFilterUnit
+MultiFeatureUnit1CreationTool_title=MultiFeatureUnit
+MultiFeatureUnit1CreationTool_desc=Create new MultiFeatureUnit
+SingleFeatureUnit2CreationTool_title=SingleFeatureUnit
+SingleFeatureUnit2CreationTool_desc=Create new SingleFeatureUnit
+MultiInputPort1CreationTool_title=MultiInputPort
+MultiInputPort1CreationTool_desc=Create new MultiInputPort
+MultiOutputPort2CreationTool_title=MultiOutputPort
+MultiOutputPort2CreationTool_desc=Create new MultiOutputPort
+SingleInputPort3CreationTool_title=SingleInputPort
+SingleInputPort3CreationTool_desc=Create new SingleInputPort
+SingleOutputPort4CreationTool_title=SingleOutputPort
+SingleOutputPort4CreationTool_desc=Create new SingleOutputPort
diff --git a/org.eclipse.emf.refactor.comrel.diagram/plugin.properties b/org.eclipse.emf.refactor.comrel.diagram/plugin.properties
new file mode 100644
index 0000000..79c5985
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/plugin.properties
@@ -0,0 +1,126 @@
+pluginName=Comrel Plugin
+providerName=Sample Plugin Provider, Inc
+
+editorName=Comrel Diagram Editing
+context.description=Comrel Diagram Editing
+context.name=In Comrel Diagram Editor
+newWizardName=Comrel Diagram
+newWizardDesc=Creates Comrel diagram.
+
+initDiagramActionLabel=Initialize comrel_diagram diagram file
+
+
+navigatorContentName=*.comrel_diagram diagram contents
+domainNavigatorContentName=*.comrel model contents
+update.diagram.name=Update Comrel diagram
+update.diagram.description=Perform Comrel diagram update
+
+
+# Property Sheet
+tab.appearance=Appearance
+tab.diagram=Rulers & Grid
+tab.domain=Core
+
+# Preferences
+prefpage.comrel.diagram.general=Comrel Diagram
+prefpage.comrel.diagram.appearance=Appearance
+prefpage.comrel.diagram.connections=Connections
+prefpage.comrel.diagram.printing=Printing
+prefpage.comrel.diagram.rulersAndGrid=Rulers And Grid
+
+
+# Providers
+metatype.name.CompositeRefactoring_1000=Undefined
+metatype.name.SingleInputPort_2001=SingleInputPort
+metatype.name.CartesianQueuedUnit_2002=CartesianQueuedUnit
+metatype.name.ParallelQueuedUnit_2003=ParallelQueuedUnit
+metatype.name.SingleQueuedUnit_2004=SingleQueuedUnit
+metatype.name.SequentialUnit_2005=SequentialUnit
+metatype.name.ConditionalUnit_2006=ConditionalUnit
+metatype.name.AtomicUnit_2007=AtomicUnit
+metatype.name.SingleInputPort_3001=SingleInputPort
+metatype.name.MultiInputPort_3002=MultiInputPort
+metatype.name.CartesianQueuedUnit_3003=CartesianQueuedUnit
+metatype.name.ParallelQueuedUnit_3004=ParallelQueuedUnit
+metatype.name.SingleInputPort_3005=SingleInputPort
+metatype.name.MultiInputPort_3006=MultiInputPort
+metatype.name.CartesianQueuedUnit_3007=CartesianQueuedUnit
+metatype.name.SingleFeatureUnit_3008=SingleFeatureUnit
+metatype.name.SingleInputPort_3009=SingleInputPort
+metatype.name.MultiInputPort_3010=MultiInputPort
+metatype.name.SingleOutputPort_3011=SingleOutputPort
+metatype.name.MultiFeatureUnit_3012=MultiFeatureUnit
+metatype.name.SingleInputPort_3013=SingleInputPort
+metatype.name.MultiInputPort_3014=MultiInputPort
+metatype.name.MultiOutputPort_3015=MultiOutputPort
+metatype.name.SingleFilterUnit_3016=SingleFilterUnit
+metatype.name.MultiInputPort_3017=MultiInputPort
+metatype.name.SingleOutputPort_3018=SingleOutputPort
+metatype.name.MultiFilterUnit_3019=MultiFilterUnit
+metatype.name.MultiInputPort_3020=MultiInputPort
+metatype.name.MultiOutputPort_3021=MultiOutputPort
+metatype.name.SingleQueuedUnit_3022=SingleQueuedUnit
+metatype.name.SingleInputPort_3023=SingleInputPort
+metatype.name.MultiInputPort_3024=MultiInputPort
+metatype.name.CartesianQueuedUnit_3025=CartesianQueuedUnit
+metatype.name.SequentialUnit_3026=SequentialUnit
+metatype.name.SingleInputPort_3027=SingleInputPort
+metatype.name.MultiInputPort_3028=MultiInputPort
+metatype.name.CartesianQueuedUnit_3029=CartesianQueuedUnit
+metatype.name.ConditionalUnit_3030=ConditionalUnit
+metatype.name.SingleInputPort_3031=SingleInputPort
+metatype.name.MultiInputPort_3032=MultiInputPort
+metatype.name.CartesianQueuedUnit_3033=CartesianQueuedUnit
+metatype.name.AtomicUnit_3034=AtomicUnit
+metatype.name.SingleInputPort_3035=SingleInputPort
+metatype.name.ParallelQueuedUnit_3036=ParallelQueuedUnit
+metatype.name.ParallelQueuedUnit_3037=ParallelQueuedUnit
+metatype.name.SingleFeatureUnit_3038=SingleFeatureUnit
+metatype.name.MultiFeatureUnit_3039=MultiFeatureUnit
+metatype.name.SingleFilterUnit_3040=SingleFilterUnit
+metatype.name.MultiFilterUnit_3041=MultiFilterUnit
+metatype.name.SingleQueuedUnit_3042=SingleQueuedUnit
+metatype.name.ParallelQueuedUnit_3043=ParallelQueuedUnit
+metatype.name.SequentialUnit_3044=SequentialUnit
+metatype.name.ParallelQueuedUnit_3045=ParallelQueuedUnit
+metatype.name.ConditionalUnit_3046=ConditionalUnit
+metatype.name.CartesianQueuedUnit_3047=CartesianQueuedUnit
+metatype.name.ParallelQueuedUnit_3048=ParallelQueuedUnit
+metatype.name.AtomicUnit_3049=AtomicUnit
+metatype.name.SingleFeatureUnit_3050=SingleFeatureUnit
+metatype.name.MultiFeatureUnit_3051=MultiFeatureUnit
+metatype.name.SingleFilterUnit_3052=SingleFilterUnit
+metatype.name.MultiFilterUnit_3053=MultiFilterUnit
+metatype.name.SingleQueuedUnit_3054=SingleQueuedUnit
+metatype.name.SingleFeatureUnit_3055=SingleFeatureUnit
+metatype.name.MultiFeatureUnit_3056=MultiFeatureUnit
+metatype.name.SingleFilterUnit_3057=SingleFilterUnit
+metatype.name.MultiFilterUnit_3058=MultiFilterUnit
+metatype.name.SingleQueuedUnit_3059=SingleQueuedUnit
+metatype.name.SequentialUnit_3060=SequentialUnit
+metatype.name.SingleFeatureUnit_3061=SingleFeatureUnit
+metatype.name.MultiFeatureUnit_3062=MultiFeatureUnit
+metatype.name.SingleFilterUnit_3063=SingleFilterUnit
+metatype.name.MultiFilterUnit_3064=MultiFilterUnit
+metatype.name.SingleQueuedUnit_3065=SingleQueuedUnit
+metatype.name.ConditionalUnit_3066=ConditionalUnit
+metatype.name.SingleQueuedUnit_3067=SingleQueuedUnit
+metatype.name.AtomicUnit_3068=AtomicUnit
+metatype.name.SequentialUnit_3069=SequentialUnit
+metatype.name.SequentialUnit_3070=SequentialUnit
+metatype.name.ConditionalUnit_3071=ConditionalUnit
+metatype.name.ConditionalUnit_3072=ConditionalUnit
+metatype.name.SequentialUnit_3073=SequentialUnit
+metatype.name.AtomicUnit_3074=AtomicUnit
+metatype.name.ConditionalUnit_3075=ConditionalUnit
+metatype.name.ConditionCheck_3076=ConditionCheck
+metatype.name.AtomicUnit_3077=AtomicUnit
+metatype.name.AtomicUnit_3078=AtomicUnit
+metatype.name.SinglePortMapping_4001=SinglePortMapping
+metatype.name.MultiPortMapping_4002=MultiPortMapping
+metatype.name.MultiSinglePortMapping_4003=MultiSinglePortMapping
+
+# Commands and menu actions
+cmdcategory.name=Comrel Editor Commands
+cmdcategory.desc=Comrel Editor Commands
+
diff --git a/org.eclipse.emf.refactor.comrel.diagram/plugin.xml b/org.eclipse.emf.refactor.comrel.diagram/plugin.xml
new file mode 100644
index 0000000..147f9ca
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/plugin.xml
@@ -0,0 +1,1438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+
+-->
+<plugin>
+
+   <extension point="org.eclipse.team.core.fileTypes" id="repo-ftype">
+      <?gmfgen generated="true"?>
+      <fileTypes type="text" extension="comrel_diagram"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser" id="resource-factory">
+      <?gmfgen generated="true"?>
+      <parser
+         type="comrel_diagram"
+         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
+      </parser>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors" id="gmf-editor">
+      <?gmfgen generated="true"?>
+      <editor
+         id="comrel.diagram.part.ComrelDiagramEditorID"
+         name="%editorName"
+         icon="icons/obj16/ComrelDiagramFile.gif"
+         extensions="comrel_diagram"
+         default="true"
+         class="comrel.diagram.part.ComrelDiagramEditor"
+         matchingStrategy="comrel.diagram.part.ComrelMatchingStrategy"
+         contributorClass="comrel.diagram.part.ComrelDiagramActionBarContributor">
+      </editor>
+   </extension>
+   
+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+      <?gmfgen generated="true"?>
+      <context
+         description="%context.description"
+         id="comrel.diagram.ui.diagramContext"
+         name="%context.name"
+         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+      </context>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards" id="creation-wizard">
+      <?gmfgen generated="true"?>
+  	  <wizard
+  	     name="CoMReL diagram"
+  	     icon="icons/obj16/ComrelDiagramFile.gif"
+  	     category="comrel.generator.category"
+  	     class="comrel.diagram.part.ComrelCreationWizard"
+  	     id="comrel.diagram.part.ComrelCreationWizardID">
+  	  	 <description>%newWizardDesc</description>  
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.popupMenus" id="init-diagram-action">
+      <?gmfgen generated="true"?>
+      <objectContribution
+            id="comrel.diagram.InitDiagram"
+            nameFilter="*.comrel"
+            objectClass="org.eclipse.core.resources.IFile">
+         <action
+               label="%initDiagramActionLabel"
+               class="comrel.diagram.part.ComrelInitDiagramFileAction"
+               menubarPath="additions"
+               enablesFor="1"
+               id="comrel.diagram.InitDiagramAction">
+         </action>
+      </objectContribution>
+   </extension>
+	
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders" id="global-actions">
+      <?gmfgen generated="true"?>
+      <GlobalActionHandlerProvider
+         class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandlerProvider"
+         id="ComrelPresentation">
+         <Priority name="Lowest"/>
+         <ViewId id="comrel.diagram.part.ComrelDiagramEditorID">
+            <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.printing.render.providers.DiagramWithPrintGlobalActionHandlerProvider"
+         id="ComrelPresentationPrint">
+         <Priority name="Lowest"/>
+         <ViewId id="comrel.diagram.part.ComrelDiagramEditorID">
+            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
+               <GlobalActionId actionId="print"/>
+            </ElementType>
+         </ViewId>
+      </GlobalActionHandlerProvider>
+      <GlobalActionHandlerProvider
+         class="org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers.DiagramIDEGlobalActionHandlerProvider"
+         id="ComrelPresentationIDE">
+         <Priority name="Lowest"/>
+         <ViewId id="comrel.diagram.part.ComrelDiagramEditorID">
+            <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="ComrelRender">
+         <Priority name="Lowest"/>
+         <ViewId id="comrel.diagram.part.ComrelDiagramEditorID">
+            <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.common.ui.services.markerNavigationProviders" id="markers-navigation">
+      <?gmfgen generated="true"?>
+      <MarkerNavigationProvider class="comrel.diagram.providers.ComrelMarkerNavigationProvider">
+         <MarkerType name="comrel.diagram.diagnostic"/>
+         <Priority name="Lowest"/>
+      </MarkerNavigationProvider>
+   </extension>
+
+   <extension id="diagnostic" name="Comrel Plugin problems" point="org.eclipse.core.resources.markers">
+      <?gmfgen generated="true"?>
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+      <persistent value="true"/>
+   </extension>   
+
+   <extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+      <?gmfgen generated="true"?>
+      <decoratorProvider class="comrel.diagram.providers.ComrelValidationDecoratorProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+         <context decoratorTargets="PRIMARY_VIEW"/>
+      </decoratorProvider>
+   </extension>
+
+   <extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="comrel.diagram.preferences.DiagramPreferenceInitializer"/>
+   </extension>
+
+   <extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+      <page
+            id="comrel.diagram.general"
+            name="%prefpage.comrel.diagram.general"
+            class="comrel.diagram.preferences.DiagramGeneralPreferencePage">
+      </page>
+      <page
+            id="comrel.diagram.appearance"
+            name="%prefpage.comrel.diagram.appearance"
+            category="comrel.diagram.general"
+            class="comrel.diagram.preferences.DiagramAppearancePreferencePage">
+      </page>
+      <page
+            id="comrel.diagram.connections"
+            name="%prefpage.comrel.diagram.connections"
+            category="comrel.diagram.general"
+            class="comrel.diagram.preferences.DiagramConnectionsPreferencePage">
+      </page>
+      <page
+            id="comrel.diagram.printing"
+            name="%prefpage.comrel.diagram.printing"
+            category="comrel.diagram.general"
+            class="comrel.diagram.preferences.DiagramPrintingPreferencePage">
+      </page>
+      <page
+            id="comrel.diagram.rulersAndGrid"
+            name="%prefpage.comrel.diagram.rulersAndGrid"
+            category="comrel.diagram.general"
+            class="comrel.diagram.preferences.DiagramRulersAndGridPreferencePage">
+      </page>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="comrel.diagram"
+            labelProvider="comrel.diagram.sheet.ComrelSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="comrel.diagram">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="comrel.diagram">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="comrel.diagram.sheet.ComrelPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+            <input type="comrel.diagram.navigator.ComrelAbstractNavigatorItem"/>
+         </propertySection>
+      </propertySections>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="comrel.diagram.providers.ComrelViewProvider">
+         <Priority name="Lowest"/>
+         <object id="referencing-diagrams" class="org.eclipse.gmf.runtime.notation.Diagram">
+            <method name="getType()" value="comrel"/>
+         </object>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" containerViews="referencing-diagrams"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="Comrel"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2001,2002,2003,2004,2005,2006,2007,3001,3002,3003,3004,3005,3006,3007,3008,3009,3010,3011,3012,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,3038,3039,3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,3067,3068,3069,3070,3071,3072,3073,3074,3075,3076,3077,3078"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4002,4003"/>
+      </viewProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+      <?gmfgen generated="true"?>
+      <editpartProvider class="comrel.diagram.providers.ComrelEditPartProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+            <method name="getType()" value="Comrel"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+            <method name="getType()" value="2001,2002,2003,2004,2005,2006,2007,3001,3002,3003,3004,3005,3006,3007,3008,3009,3010,3011,3012,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,3038,3039,3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,3067,3068,3069,3070,3071,3072,3073,3074,3075,3076,3077,3078"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+            <method name="getType()" value="4001,4002,4003"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+            <method name="getType()" value="5001,5080,5081,5082,5083,5084,5085,5002,5003,5079,5078,5004,5005,5077,5009,5006,5007,5008,5013,5010,5011,5012,5016,5014,5015,5019,5017,5018,5076,5020,5021,5075,5074,5022,5023,5073,5072,5024,5025,5028,5027,5026,5071,5070,5029,5030,5031,5032,5069,5068,5067,5066,5065,5033,5035,5034,5036,5037,5038,5039,5064,5040,5041,5042,5043,5063,5062,5044,5045,5046,5047,5061,5060,5049,5048,5059,5058,5057,5056,5051,5050,5055,5052,5053,5054"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+            <method name="getType()" value="7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013,7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029,7030,7031,7032,7033,7034,7035,7036,7037,7038,7039,7040,7041,7042,7043,7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7074,7075,7076,7077,7078,7079,7080,7081,7082,7083,7084"/>
+         </object>
+         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+      </editpartProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider">
+      <?gmfgen generated="true"?>
+      <modelingAssistantProvider class="comrel.diagram.providers.ComrelModelingAssistantProvider">
+         <Priority name="Lowest"/>
+         <object class="comrel.diagram.edit.parts.CompositeRefactoringEditPart" id="CompositeRefactoring_1000"/>
+         <object class="comrel.diagram.edit.parts.SingleInputPortEditPart" id="SingleInputPort_2001"/>
+         <object class="comrel.diagram.edit.parts.CartesianQueuedUnitEditPart" id="CartesianQueuedUnit_2002"/>
+         <object class="comrel.diagram.edit.parts.ParallelQueuedUnitEditPart" id="ParallelQueuedUnit_2003"/>
+         <object class="comrel.diagram.edit.parts.SingleQueuedUnitEditPart" id="SingleQueuedUnit_2004"/>
+         <object class="comrel.diagram.edit.parts.SequentialUnitEditPart" id="SequentialUnit_2005"/>
+         <object class="comrel.diagram.edit.parts.ConditionalUnitEditPart" id="ConditionalUnit_2006"/>
+         <object class="comrel.diagram.edit.parts.AtomicUnitEditPart" id="AtomicUnit_2007"/>
+         <context elements="CompositeRefactoring_1000,SingleInputPort_2001,CartesianQueuedUnit_2002,ParallelQueuedUnit_2003,SingleQueuedUnit_2004,SequentialUnit_2005,ConditionalUnit_2006,AtomicUnit_2007"/>
+      </modelingAssistantProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="comrel.diagram.providers.ComrelIconProvider">
+         <Priority name="Low"/>
+      </IconProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="comrel.diagram.providers.ComrelParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders" id="decorator-provider">
+      <?gmfgen generated="true"?>
+      <decoratorProvider class="comrel.diagram.providers.ComrelShortcutsDecoratorProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)" id="generated-top-nodes">
+            <method name="getType()" value="2001,2002,2003,2004,2005,2006,2007"/>
+         </object>
+         <context decoratorTargets="generated-top-nodes"/>
+      </decoratorProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.CompositeRefactoring_1000"
+               name="%metatype.name.CompositeRefactoring_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="CompositeRefactoring"
+               edithelper="comrel.diagram.edit.helpers.CompositeRefactoringEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.SingleInputPort_2001"
+               name="%metatype.name.SingleInputPort_2001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SingleInputPort"
+               edithelper="comrel.diagram.edit.helpers.SingleInputPortEditHelper">
+            <param name="semanticHint" value="2001"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.CartesianQueuedUnit_2002"
+               name="%metatype.name.CartesianQueuedUnit_2002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="CartesianQueuedUnit"
+               edithelper="comrel.diagram.edit.helpers.CartesianQueuedUnitEditHelper">
+            <param name="semanticHint" value="2002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ParallelQueuedUnit_2003"
+               name="%metatype.name.ParallelQueuedUnit_2003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ParallelQueuedUnit_3004"/>
+            <param name="semanticHint" value="2003"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleQueuedUnit_2004"
+               name="%metatype.name.SingleQueuedUnit_2004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleQueuedUnit_3022"/>
+            <param name="semanticHint" value="2004"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SequentialUnit_2005"
+               name="%metatype.name.SequentialUnit_2005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SequentialUnit_3026"/>
+            <param name="semanticHint" value="2005"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ConditionalUnit_2006"
+               name="%metatype.name.ConditionalUnit_2006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ConditionalUnit_3030"/>
+            <param name="semanticHint" value="2006"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.AtomicUnit_2007"
+               name="%metatype.name.AtomicUnit_2007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.AtomicUnit_3034"/>
+            <param name="semanticHint" value="2007"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3001"
+               name="%metatype.name.SingleInputPort_3001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3001"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.MultiInputPort_3002"
+               name="%metatype.name.MultiInputPort_3002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="MultiInputPort"
+               edithelper="comrel.diagram.edit.helpers.MultiInputPortEditHelper">
+            <param name="semanticHint" value="3002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.CartesianQueuedUnit_3003"
+               name="%metatype.name.CartesianQueuedUnit_3003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.CartesianQueuedUnit_2002"/>
+            <param name="semanticHint" value="3003"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.ParallelQueuedUnit_3004"
+               name="%metatype.name.ParallelQueuedUnit_3004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ParallelQueuedUnit"
+               edithelper="comrel.diagram.edit.helpers.ParallelQueuedUnitEditHelper">
+            <param name="semanticHint" value="3004"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3005"
+               name="%metatype.name.SingleInputPort_3005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3005"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3006"
+               name="%metatype.name.MultiInputPort_3006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3006"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.CartesianQueuedUnit_3007"
+               name="%metatype.name.CartesianQueuedUnit_3007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.CartesianQueuedUnit_2002"/>
+            <param name="semanticHint" value="3007"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.SingleFeatureUnit_3008"
+               name="%metatype.name.SingleFeatureUnit_3008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SingleFeatureUnit"
+               edithelper="comrel.diagram.edit.helpers.SingleFeatureUnitEditHelper">
+            <param name="semanticHint" value="3008"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3009"
+               name="%metatype.name.SingleInputPort_3009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3009"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3010"
+               name="%metatype.name.MultiInputPort_3010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3010"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.SingleOutputPort_3011"
+               name="%metatype.name.SingleOutputPort_3011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SingleOutputPort"
+               edithelper="comrel.diagram.edit.helpers.SingleOutputPortEditHelper">
+            <param name="semanticHint" value="3011"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.MultiFeatureUnit_3012"
+               name="%metatype.name.MultiFeatureUnit_3012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="MultiFeatureUnit"
+               edithelper="comrel.diagram.edit.helpers.MultiFeatureUnitEditHelper">
+            <param name="semanticHint" value="3012"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3013"
+               name="%metatype.name.SingleInputPort_3013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3013"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3014"
+               name="%metatype.name.MultiInputPort_3014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3014"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.MultiOutputPort_3015"
+               name="%metatype.name.MultiOutputPort_3015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="MultiOutputPort"
+               edithelper="comrel.diagram.edit.helpers.MultiOutputPortEditHelper">
+            <param name="semanticHint" value="3015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.SingleFilterUnit_3016"
+               name="%metatype.name.SingleFilterUnit_3016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SingleFilterUnit"
+               edithelper="comrel.diagram.edit.helpers.SingleFilterUnitEditHelper">
+            <param name="semanticHint" value="3016"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3017"
+               name="%metatype.name.MultiInputPort_3017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3017"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleOutputPort_3018"
+               name="%metatype.name.SingleOutputPort_3018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleOutputPort_3011"/>
+            <param name="semanticHint" value="3018"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.MultiFilterUnit_3019"
+               name="%metatype.name.MultiFilterUnit_3019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="MultiFilterUnit"
+               edithelper="comrel.diagram.edit.helpers.MultiFilterUnitEditHelper">
+            <param name="semanticHint" value="3019"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3020"
+               name="%metatype.name.MultiInputPort_3020"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3020"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiOutputPort_3021"
+               name="%metatype.name.MultiOutputPort_3021"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiOutputPort_3015"/>
+            <param name="semanticHint" value="3021"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.SingleQueuedUnit_3022"
+               name="%metatype.name.SingleQueuedUnit_3022"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SingleQueuedUnit"
+               edithelper="comrel.diagram.edit.helpers.SingleQueuedUnitEditHelper">
+            <param name="semanticHint" value="3022"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3023"
+               name="%metatype.name.SingleInputPort_3023"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3023"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3024"
+               name="%metatype.name.MultiInputPort_3024"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3024"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.CartesianQueuedUnit_3025"
+               name="%metatype.name.CartesianQueuedUnit_3025"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.CartesianQueuedUnit_2002"/>
+            <param name="semanticHint" value="3025"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.SequentialUnit_3026"
+               name="%metatype.name.SequentialUnit_3026"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SequentialUnit"
+               edithelper="comrel.diagram.edit.helpers.SequentialUnitEditHelper">
+            <param name="semanticHint" value="3026"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3027"
+               name="%metatype.name.SingleInputPort_3027"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3027"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3028"
+               name="%metatype.name.MultiInputPort_3028"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3028"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.CartesianQueuedUnit_3029"
+               name="%metatype.name.CartesianQueuedUnit_3029"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.CartesianQueuedUnit_2002"/>
+            <param name="semanticHint" value="3029"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.ConditionalUnit_3030"
+               name="%metatype.name.ConditionalUnit_3030"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ConditionalUnit"
+               edithelper="comrel.diagram.edit.helpers.ConditionalUnitEditHelper">
+            <param name="semanticHint" value="3030"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3031"
+               name="%metatype.name.SingleInputPort_3031"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3031"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiInputPort_3032"
+               name="%metatype.name.MultiInputPort_3032"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiInputPort_3002"/>
+            <param name="semanticHint" value="3032"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.CartesianQueuedUnit_3033"
+               name="%metatype.name.CartesianQueuedUnit_3033"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.CartesianQueuedUnit_2002"/>
+            <param name="semanticHint" value="3033"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.AtomicUnit_3034"
+               name="%metatype.name.AtomicUnit_3034"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="AtomicUnit"
+               edithelper="comrel.diagram.edit.helpers.AtomicUnitEditHelper">
+            <param name="semanticHint" value="3034"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleInputPort_3035"
+               name="%metatype.name.SingleInputPort_3035"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleInputPort_2001"/>
+            <param name="semanticHint" value="3035"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ParallelQueuedUnit_3036"
+               name="%metatype.name.ParallelQueuedUnit_3036"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ParallelQueuedUnit_3004"/>
+            <param name="semanticHint" value="3036"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ParallelQueuedUnit_3037"
+               name="%metatype.name.ParallelQueuedUnit_3037"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ParallelQueuedUnit_3004"/>
+            <param name="semanticHint" value="3037"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFeatureUnit_3038"
+               name="%metatype.name.SingleFeatureUnit_3038"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFeatureUnit_3008"/>
+            <param name="semanticHint" value="3038"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFeatureUnit_3039"
+               name="%metatype.name.MultiFeatureUnit_3039"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFeatureUnit_3012"/>
+            <param name="semanticHint" value="3039"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFilterUnit_3040"
+               name="%metatype.name.SingleFilterUnit_3040"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFilterUnit_3016"/>
+            <param name="semanticHint" value="3040"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFilterUnit_3041"
+               name="%metatype.name.MultiFilterUnit_3041"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFilterUnit_3019"/>
+            <param name="semanticHint" value="3041"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleQueuedUnit_3042"
+               name="%metatype.name.SingleQueuedUnit_3042"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleQueuedUnit_3022"/>
+            <param name="semanticHint" value="3042"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ParallelQueuedUnit_3043"
+               name="%metatype.name.ParallelQueuedUnit_3043"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ParallelQueuedUnit_3004"/>
+            <param name="semanticHint" value="3043"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SequentialUnit_3044"
+               name="%metatype.name.SequentialUnit_3044"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SequentialUnit_3026"/>
+            <param name="semanticHint" value="3044"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ParallelQueuedUnit_3045"
+               name="%metatype.name.ParallelQueuedUnit_3045"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ParallelQueuedUnit_3004"/>
+            <param name="semanticHint" value="3045"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ConditionalUnit_3046"
+               name="%metatype.name.ConditionalUnit_3046"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ConditionalUnit_3030"/>
+            <param name="semanticHint" value="3046"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.CartesianQueuedUnit_3047"
+               name="%metatype.name.CartesianQueuedUnit_3047"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.CartesianQueuedUnit_2002"/>
+            <param name="semanticHint" value="3047"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ParallelQueuedUnit_3048"
+               name="%metatype.name.ParallelQueuedUnit_3048"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ParallelQueuedUnit_3004"/>
+            <param name="semanticHint" value="3048"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.AtomicUnit_3049"
+               name="%metatype.name.AtomicUnit_3049"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.AtomicUnit_3034"/>
+            <param name="semanticHint" value="3049"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFeatureUnit_3050"
+               name="%metatype.name.SingleFeatureUnit_3050"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFeatureUnit_3008"/>
+            <param name="semanticHint" value="3050"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFeatureUnit_3051"
+               name="%metatype.name.MultiFeatureUnit_3051"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFeatureUnit_3012"/>
+            <param name="semanticHint" value="3051"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFilterUnit_3052"
+               name="%metatype.name.SingleFilterUnit_3052"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFilterUnit_3016"/>
+            <param name="semanticHint" value="3052"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFilterUnit_3053"
+               name="%metatype.name.MultiFilterUnit_3053"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFilterUnit_3019"/>
+            <param name="semanticHint" value="3053"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleQueuedUnit_3054"
+               name="%metatype.name.SingleQueuedUnit_3054"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleQueuedUnit_3022"/>
+            <param name="semanticHint" value="3054"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFeatureUnit_3055"
+               name="%metatype.name.SingleFeatureUnit_3055"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFeatureUnit_3008"/>
+            <param name="semanticHint" value="3055"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFeatureUnit_3056"
+               name="%metatype.name.MultiFeatureUnit_3056"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFeatureUnit_3012"/>
+            <param name="semanticHint" value="3056"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFilterUnit_3057"
+               name="%metatype.name.SingleFilterUnit_3057"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFilterUnit_3016"/>
+            <param name="semanticHint" value="3057"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFilterUnit_3058"
+               name="%metatype.name.MultiFilterUnit_3058"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFilterUnit_3019"/>
+            <param name="semanticHint" value="3058"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleQueuedUnit_3059"
+               name="%metatype.name.SingleQueuedUnit_3059"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleQueuedUnit_3022"/>
+            <param name="semanticHint" value="3059"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SequentialUnit_3060"
+               name="%metatype.name.SequentialUnit_3060"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SequentialUnit_3026"/>
+            <param name="semanticHint" value="3060"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFeatureUnit_3061"
+               name="%metatype.name.SingleFeatureUnit_3061"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFeatureUnit_3008"/>
+            <param name="semanticHint" value="3061"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFeatureUnit_3062"
+               name="%metatype.name.MultiFeatureUnit_3062"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFeatureUnit_3012"/>
+            <param name="semanticHint" value="3062"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleFilterUnit_3063"
+               name="%metatype.name.SingleFilterUnit_3063"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleFilterUnit_3016"/>
+            <param name="semanticHint" value="3063"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.MultiFilterUnit_3064"
+               name="%metatype.name.MultiFilterUnit_3064"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.MultiFilterUnit_3019"/>
+            <param name="semanticHint" value="3064"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleQueuedUnit_3065"
+               name="%metatype.name.SingleQueuedUnit_3065"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleQueuedUnit_3022"/>
+            <param name="semanticHint" value="3065"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ConditionalUnit_3066"
+               name="%metatype.name.ConditionalUnit_3066"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ConditionalUnit_3030"/>
+            <param name="semanticHint" value="3066"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SingleQueuedUnit_3067"
+               name="%metatype.name.SingleQueuedUnit_3067"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SingleQueuedUnit_3022"/>
+            <param name="semanticHint" value="3067"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.AtomicUnit_3068"
+               name="%metatype.name.AtomicUnit_3068"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.AtomicUnit_3034"/>
+            <param name="semanticHint" value="3068"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SequentialUnit_3069"
+               name="%metatype.name.SequentialUnit_3069"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SequentialUnit_3026"/>
+            <param name="semanticHint" value="3069"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SequentialUnit_3070"
+               name="%metatype.name.SequentialUnit_3070"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SequentialUnit_3026"/>
+            <param name="semanticHint" value="3070"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ConditionalUnit_3071"
+               name="%metatype.name.ConditionalUnit_3071"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ConditionalUnit_3030"/>
+            <param name="semanticHint" value="3071"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ConditionalUnit_3072"
+               name="%metatype.name.ConditionalUnit_3072"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ConditionalUnit_3030"/>
+            <param name="semanticHint" value="3072"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.SequentialUnit_3073"
+               name="%metatype.name.SequentialUnit_3073"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.SequentialUnit_3026"/>
+            <param name="semanticHint" value="3073"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.AtomicUnit_3074"
+               name="%metatype.name.AtomicUnit_3074"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.AtomicUnit_3034"/>
+            <param name="semanticHint" value="3074"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.ConditionalUnit_3075"
+               name="%metatype.name.ConditionalUnit_3075"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.ConditionalUnit_3030"/>
+            <param name="semanticHint" value="3075"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.ConditionCheck_3076"
+               name="%metatype.name.ConditionCheck_3076"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ConditionCheck"
+               edithelper="comrel.diagram.edit.helpers.ConditionCheckEditHelper">
+            <param name="semanticHint" value="3076"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.AtomicUnit_3077"
+               name="%metatype.name.AtomicUnit_3077"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.AtomicUnit_3034"/>
+            <param name="semanticHint" value="3077"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <specializationType
+               id="comrel.diagram.AtomicUnit_3078"
+               name="%metatype.name.AtomicUnit_3078"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="comrel.diagram.AtomicUnit_3034"/>
+            <param name="semanticHint" value="3078"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.SinglePortMapping_4001"
+               name="%metatype.name.SinglePortMapping_4001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SinglePortMapping"
+               edithelper="comrel.diagram.edit.helpers.SinglePortMappingEditHelper">
+            <param name="semanticHint" value="4001"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.MultiPortMapping_4002"
+               name="%metatype.name.MultiPortMapping_4002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="MultiPortMapping"
+               edithelper="comrel.diagram.edit.helpers.MultiPortMappingEditHelper">
+            <param name="semanticHint" value="4002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://comrel/0.1">
+         <metamodelType
+               id="comrel.diagram.MultiSinglePortMapping_4003"
+               name="%metatype.name.MultiSinglePortMapping_4003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="MultiSinglePortMapping"
+               edithelper="comrel.diagram.edit.helpers.MultiSinglePortMappingEditHelper">
+            <param name="semanticHint" value="4003"/>
+         </metamodelType>
+      </metamodel>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="comrel.diagram.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="comrel.diagram.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="comrel.diagram.TypeContext">
+         <elementType ref="comrel.diagram.CompositeRefactoring_1000"/>
+         <elementType ref="comrel.diagram.SingleInputPort_2001"/>
+         <elementType ref="comrel.diagram.CartesianQueuedUnit_2002"/>
+         <elementType ref="comrel.diagram.ParallelQueuedUnit_2003"/>
+         <elementType ref="comrel.diagram.SingleQueuedUnit_2004"/>
+         <elementType ref="comrel.diagram.SequentialUnit_2005"/>
+         <elementType ref="comrel.diagram.ConditionalUnit_2006"/>
+         <elementType ref="comrel.diagram.AtomicUnit_2007"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3001"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3002"/>
+         <elementType ref="comrel.diagram.CartesianQueuedUnit_3003"/>
+         <elementType ref="comrel.diagram.ParallelQueuedUnit_3004"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3005"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3006"/>
+         <elementType ref="comrel.diagram.CartesianQueuedUnit_3007"/>
+         <elementType ref="comrel.diagram.SingleFeatureUnit_3008"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3009"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3010"/>
+         <elementType ref="comrel.diagram.SingleOutputPort_3011"/>
+         <elementType ref="comrel.diagram.MultiFeatureUnit_3012"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3013"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3014"/>
+         <elementType ref="comrel.diagram.MultiOutputPort_3015"/>
+         <elementType ref="comrel.diagram.SingleFilterUnit_3016"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3017"/>
+         <elementType ref="comrel.diagram.SingleOutputPort_3018"/>
+         <elementType ref="comrel.diagram.MultiFilterUnit_3019"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3020"/>
+         <elementType ref="comrel.diagram.MultiOutputPort_3021"/>
+         <elementType ref="comrel.diagram.SingleQueuedUnit_3022"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3023"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3024"/>
+         <elementType ref="comrel.diagram.CartesianQueuedUnit_3025"/>
+         <elementType ref="comrel.diagram.SequentialUnit_3026"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3027"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3028"/>
+         <elementType ref="comrel.diagram.CartesianQueuedUnit_3029"/>
+         <elementType ref="comrel.diagram.ConditionalUnit_3030"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3031"/>
+         <elementType ref="comrel.diagram.MultiInputPort_3032"/>
+         <elementType ref="comrel.diagram.CartesianQueuedUnit_3033"/>
+         <elementType ref="comrel.diagram.AtomicUnit_3034"/>
+         <elementType ref="comrel.diagram.SingleInputPort_3035"/>
+         <elementType ref="comrel.diagram.ParallelQueuedUnit_3036"/>
+         <elementType ref="comrel.diagram.ParallelQueuedUnit_3037"/>
+         <elementType ref="comrel.diagram.SingleFeatureUnit_3038"/>
+         <elementType ref="comrel.diagram.MultiFeatureUnit_3039"/>
+         <elementType ref="comrel.diagram.SingleFilterUnit_3040"/>
+         <elementType ref="comrel.diagram.MultiFilterUnit_3041"/>
+         <elementType ref="comrel.diagram.SingleQueuedUnit_3042"/>
+         <elementType ref="comrel.diagram.ParallelQueuedUnit_3043"/>
+         <elementType ref="comrel.diagram.SequentialUnit_3044"/>
+         <elementType ref="comrel.diagram.ParallelQueuedUnit_3045"/>
+         <elementType ref="comrel.diagram.ConditionalUnit_3046"/>
+         <elementType ref="comrel.diagram.CartesianQueuedUnit_3047"/>
+         <elementType ref="comrel.diagram.ParallelQueuedUnit_3048"/>
+         <elementType ref="comrel.diagram.AtomicUnit_3049"/>
+         <elementType ref="comrel.diagram.SingleFeatureUnit_3050"/>
+         <elementType ref="comrel.diagram.MultiFeatureUnit_3051"/>
+         <elementType ref="comrel.diagram.SingleFilterUnit_3052"/>
+         <elementType ref="comrel.diagram.MultiFilterUnit_3053"/>
+         <elementType ref="comrel.diagram.SingleQueuedUnit_3054"/>
+         <elementType ref="comrel.diagram.SingleFeatureUnit_3055"/>
+         <elementType ref="comrel.diagram.MultiFeatureUnit_3056"/>
+         <elementType ref="comrel.diagram.SingleFilterUnit_3057"/>
+         <elementType ref="comrel.diagram.MultiFilterUnit_3058"/>
+         <elementType ref="comrel.diagram.SingleQueuedUnit_3059"/>
+         <elementType ref="comrel.diagram.SequentialUnit_3060"/>
+         <elementType ref="comrel.diagram.SingleFeatureUnit_3061"/>
+         <elementType ref="comrel.diagram.MultiFeatureUnit_3062"/>
+         <elementType ref="comrel.diagram.SingleFilterUnit_3063"/>
+         <elementType ref="comrel.diagram.MultiFilterUnit_3064"/>
+         <elementType ref="comrel.diagram.SingleQueuedUnit_3065"/>
+         <elementType ref="comrel.diagram.ConditionalUnit_3066"/>
+         <elementType ref="comrel.diagram.SingleQueuedUnit_3067"/>
+         <elementType ref="comrel.diagram.AtomicUnit_3068"/>
+         <elementType ref="comrel.diagram.SequentialUnit_3069"/>
+         <elementType ref="comrel.diagram.SequentialUnit_3070"/>
+         <elementType ref="comrel.diagram.ConditionalUnit_3071"/>
+         <elementType ref="comrel.diagram.ConditionalUnit_3072"/>
+         <elementType ref="comrel.diagram.SequentialUnit_3073"/>
+         <elementType ref="comrel.diagram.AtomicUnit_3074"/>
+         <elementType ref="comrel.diagram.ConditionalUnit_3075"/>
+         <elementType ref="comrel.diagram.ConditionCheck_3076"/>
+         <elementType ref="comrel.diagram.AtomicUnit_3077"/>
+         <elementType ref="comrel.diagram.AtomicUnit_3078"/>
+         <elementType ref="comrel.diagram.SinglePortMapping_4001"/>
+         <elementType ref="comrel.diagram.MultiPortMapping_4002"/>
+         <elementType ref="comrel.diagram.MultiSinglePortMapping_4003"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
+	   <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
+      <?gmfgen generated="true"?>
+       <propertyTester
+           id="comrel.diagram.URIEditorInputPropertyTester"
+           type="org.eclipse.emf.common.ui.URIEditorInput"
+           namespace="comrel.diagram"
+           properties="isURIEditorInput"
+           class="comrel.diagram.part.ComrelUriEditorInputTester">
+       </propertyTester>
+   </extension>
+
+	   <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isShortcut">
+      <?gmfgen generated="true"?>
+       <propertyTester
+           id="comrel.diagram.ShortcutPropertyTester"
+           type="org.eclipse.gmf.runtime.notation.View"
+           namespace="comrel.diagram"
+           properties="isShortcut"
+           class="comrel.diagram.part.ComrelShortcutPropertyTester">
+       </propertyTester>
+   </extension>
+
+	   <extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
+      <?gmfgen generated="true"?>
+      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <contentExtension pattern="comrel.diagram.resourceContent"/>
+			<contentExtension pattern="comrel.diagram.domainResourceContent"/>
+            <contentExtension pattern="comrel.diagram.navigatorLinkHelper"/>
+         </includes>
+      </viewerContentBinding>
+      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <actionExtension pattern="comrel.diagram.navigatorActionProvider"/>
+         </includes>
+      </viewerActionBinding>
+   </extension>
+
+   <extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
+      <?gmfgen generated="true"?>
+      <navigatorContent
+            id="comrel.diagram.resourceContent" 
+            name="%navigatorContentName" 
+            priority="normal" 
+            contentProvider="comrel.diagram.navigator.ComrelNavigatorContentProvider" 
+            labelProvider="comrel.diagram.navigator.ComrelNavigatorLabelProvider"
+            icon="icons/obj16/ComrelDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+	           <and>
+    	          <instanceof value="org.eclipse.core.resources.IFile"/>
+        	      <test property="org.eclipse.core.resources.extension" value="comrel_diagram"/>
+               </and>
+               <instanceof value="comrel.diagram.navigator.ComrelAbstractNavigatorItem"/>
+           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
+           	      <test property="comrel.diagram.isShortcut"/>
+           	   </adapt>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <or>
+         	   <instanceof value="comrel.diagram.navigator.ComrelAbstractNavigatorItem"/>
+           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
+           	      <test property="comrel.diagram.isShortcut"/>
+           	   </adapt>
+            </or>
+         </possibleChildren>
+         <commonSorter 
+               id="comrel.diagram.navigatorSorter" 
+               class="comrel.diagram.navigator.ComrelNavigatorSorter">
+            <parentExpression>
+               <or>
+	              <and>
+    	             <instanceof value="org.eclipse.core.resources.IFile"/>
+        	         <test property="org.eclipse.core.resources.extension" value="comrel_diagram"/>
+                  </and>
+                  <instanceof value="comrel.diagram.navigator.ComrelAbstractNavigatorItem"/>
+               </or>
+            </parentExpression>
+         </commonSorter>
+      </navigatorContent>
+      <navigatorContent
+            id="comrel.diagram.domainResourceContent" 
+            name="%domainNavigatorContentName" 
+            priority="normal" 
+            contentProvider="comrel.diagram.navigator.ComrelDomainNavigatorContentProvider" 
+            labelProvider="comrel.diagram.navigator.ComrelDomainNavigatorLabelProvider"
+            icon="icons/obj16/ComrelDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+	           <and>
+    	          <instanceof value="org.eclipse.core.resources.IFile"/>
+        	      <test property="org.eclipse.core.resources.extension" value="comrel"/>
+               </and>
+               <instanceof value="comrel.diagram.navigator.ComrelDomainNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <instanceof value="comrel.diagram.navigator.ComrelDomainNavigatorItem"/>
+         </possibleChildren>
+      </navigatorContent>
+      <actionProvider
+            id="comrel.diagram.navigatorActionProvider"
+            class="comrel.diagram.navigator.ComrelNavigatorActionProvider">
+         <enablement>
+            <or>
+               <instanceof value="comrel.diagram.navigator.ComrelAbstractNavigatorItem"/>
+           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
+           	      <test property="comrel.diagram.isShortcut"/>
+           	   </adapt>
+            </or>
+         </enablement>
+      </actionProvider>
+   </extension>
+   
+	   <extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
+      <?gmfgen generated="true"?>
+      <linkHelper
+            id="comrel.diagram.navigatorLinkHelper"
+            class="comrel.diagram.navigator.ComrelNavigatorLinkHelper">
+         <editorInputEnablement>
+            <and>
+               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
+               <test property="comrel.diagram.isURIEditorInput"/>
+            </and>
+         </editorInputEnablement>
+         <selectionEnablement>
+            <instanceof value="comrel.diagram.navigator.ComrelAbstractNavigatorItem"/>
+         </selectionEnablement>
+      </linkHelper>
+   </extension>
+   <extension point="org.eclipse.ui.commands" id="update-cmd">
+      <?gmfgen generated="true"?>
+      <command
+         categoryId="org.eclipse.ui.category.edit"
+         defaultHandler="comrel.diagram.part.ComrelDiagramUpdateCommand"
+         description="%update.diagram.description"
+         id="comrel.diagram.updateDiagram"
+         name="%update.diagram.name"/>
+   </extension>
+   
+   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">
+      <?gmfgen generated="true"?>
+      <key 
+         commandId="comrel.diagram.updateDiagram"
+         contextId="comrel.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="F5"/>
+   </extension>
+
+   <extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="comrel.diagram.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="comrel.diagram.part.ComrelDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="comrel.diagram.edit.parts.CompositeRefactoringEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+
+   <extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="comrel.diagram.part.ComrelDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="comrel.diagram.LoadResourceAction"
+         name="Load Resource"
+         categoryId="comrel.diagram.part.ComrelDiagramEditorID"
+         defaultHandler="comrel.diagram.part.LoadResourceAction"/>
+   </extension>
+
+   <extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
+
+   <!-- optionally, specify keybindings -->
+</plugin>
diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit2CreateCommand.java
new file mode 100644
index 0000000..1c11554
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit2CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CartesianQueuedUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+

+/**

+ * @generated

+ */

+public class AtomicUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CartesianQueuedUnit container = (CartesianQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des ModelRefactorings und

+		 * erstellt anhand dessen die AtomicUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String refId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.ModelRefactoring refactoring = cr

+				.getEmfRefactoringAsModelRefactoring(refId);

+		if (refactoring != null

+				&& !cr.getModelRefactorings().contains(refactoring)) {

+			cr.getModelRefactorings().add(refactoring);

+		}

+		comrel.AtomicUnit newElement = factory.createAtomicUnit(refactoring);

+		/* end of change */

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AtomicUnit newElement, IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit3CreateCommand.java
new file mode 100644
index 0000000..8c3acc2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit3CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class AtomicUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ParallelQueuedUnit container = (ParallelQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnits() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des ModelRefactorings und

+		 * erstellt anhand dessen die AtomicUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String refId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.ModelRefactoring refactoring = cr

+				.getEmfRefactoringAsModelRefactoring(refId);

+		if (refactoring != null

+				&& !cr.getModelRefactorings().contains(refactoring)) {

+			cr.getModelRefactorings().add(refactoring);

+		}

+		comrel.AtomicUnit newElement = factory.createAtomicUnit(refactoring);

+		/* end of change */

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnits(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AtomicUnit newElement, IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit4CreateCommand.java
new file mode 100644
index 0000000..a79f5d1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit4CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class AtomicUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleQueuedUnit container = (SingleQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des ModelRefactorings und

+		 * erstellt anhand dessen die AtomicUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String refId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.ModelRefactoring refactoring = cr

+				.getEmfRefactoringAsModelRefactoring(refId);

+		if (refactoring != null

+				&& !cr.getModelRefactorings().contains(refactoring)) {

+			cr.getModelRefactorings().add(refactoring);

+		}

+		comrel.AtomicUnit newElement = factory.createAtomicUnit(refactoring);

+		/* end of change */

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AtomicUnit newElement, IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit5CreateCommand.java
new file mode 100644
index 0000000..e187479
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit5CreateCommand.java
@@ -0,0 +1,112 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class AtomicUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des ModelRefactorings und

+		 * erstellt anhand dessen die AtomicUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String refId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.ModelRefactoring refactoring = cr

+				.getEmfRefactoringAsModelRefactoring(refId);

+		if (refactoring != null

+				&& !cr.getModelRefactorings().contains(refactoring)) {

+			cr.getModelRefactorings().add(refactoring);

+		}

+		comrel.AtomicUnit newElement = factory.createAtomicUnit(refactoring);

+		/* end of change */

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getRefactoringUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AtomicUnit newElement, IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit6CreateCommand.java
new file mode 100644
index 0000000..b245bda
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit6CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class AtomicUnit6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getThen() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des ModelRefactorings und

+		 * erstellt anhand dessen die AtomicUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String refId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.ModelRefactoring refactoring = cr

+				.getEmfRefactoringAsModelRefactoring(refId);

+		if (refactoring != null

+				&& !cr.getModelRefactorings().contains(refactoring)) {

+			cr.getModelRefactorings().add(refactoring);

+		}

+		comrel.AtomicUnit newElement = factory.createAtomicUnit(refactoring);

+		/* end of change */

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setThen(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AtomicUnit newElement, IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit7CreateCommand.java
new file mode 100644
index 0000000..032c194
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnit7CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class AtomicUnit7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getElse() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des ModelRefactorings und

+		 * erstellt anhand dessen die AtomicUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String refId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.ModelRefactoring refactoring = cr

+				.getEmfRefactoringAsModelRefactoring(refId);

+		if (refactoring != null

+				&& !cr.getModelRefactorings().contains(refactoring)) {

+			cr.getModelRefactorings().add(refactoring);

+		}

+		comrel.AtomicUnit newElement = factory.createAtomicUnit(refactoring);

+		/* end of change */

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setElse(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AtomicUnit newElement, IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnitCreateCommand.java
new file mode 100644
index 0000000..18e2b16
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/AtomicUnitCreateCommand.java
@@ -0,0 +1,115 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+

+/**

+ * @generated

+ */

+public class AtomicUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CompositeRefactoring container = (CompositeRefactoring) getElementToEdit();

+		if (container.getMainRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des ModelRefactorings und

+		 * erstellt anhand dessen die AtomicUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String refId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.ModelRefactoring refactoring = cr

+				.getEmfRefactoringAsModelRefactoring(refId);

+		if (refactoring != null

+				&& !cr.getModelRefactorings().contains(refactoring)) {

+			cr.getModelRefactorings().add(refactoring);

+		}

+		comrel.AtomicUnit newElement = factory.createAtomicUnit(refactoring);

+		/* end of change */

+

+		CompositeRefactoring owner = (CompositeRefactoring) getElementToEdit();

+		owner.setMainRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AtomicUnit newElement, IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit2CreateCommand.java
new file mode 100644
index 0000000..defd644
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit2CreateCommand.java
@@ -0,0 +1,95 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CartesianQueuedUnit container = (CartesianQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		CartesianQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createCartesianQueuedUnit();

+		newElement.init();

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CartesianQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit3CreateCommand.java
new file mode 100644
index 0000000..3035806
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit3CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ParallelQueuedUnit container = (ParallelQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnits() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		CartesianQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createCartesianQueuedUnit();

+		newElement.init();

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnits(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CartesianQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit4CreateCommand.java
new file mode 100644
index 0000000..8c997d5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit4CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleQueuedUnit container = (SingleQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		CartesianQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createCartesianQueuedUnit();

+		newElement.init();

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CartesianQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit5CreateCommand.java
new file mode 100644
index 0000000..a64f6af
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit5CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		CartesianQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createCartesianQueuedUnit();

+		newElement.init();

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getRefactoringUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CartesianQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit6CreateCommand.java
new file mode 100644
index 0000000..46c3ea8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit6CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getThen() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		CartesianQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createCartesianQueuedUnit();

+		newElement.init();

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setThen(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CartesianQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit7CreateCommand.java
new file mode 100644
index 0000000..cc3e22f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnit7CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getElse() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		CartesianQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createCartesianQueuedUnit();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setElse(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CartesianQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnitCreateCommand.java
new file mode 100644
index 0000000..b80bf51
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/CartesianQueuedUnitCreateCommand.java
@@ -0,0 +1,97 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CompositeRefactoring container = (CompositeRefactoring) getElementToEdit();

+		if (container.getMainRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		CartesianQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createCartesianQueuedUnit();

+		newElement.init();

+

+		CompositeRefactoring owner = (CompositeRefactoring) getElementToEdit();

+		owner.setMainRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CartesianQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ComrelCreateShortcutDecorationsCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ComrelCreateShortcutDecorationsCommand.java
new file mode 100644
index 0000000..15a6161
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ComrelCreateShortcutDecorationsCommand.java
@@ -0,0 +1,74 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EcoreFactory;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+

+/**

+ * @generated

+ */

+public class ComrelCreateShortcutDecorationsCommand extends

+		AbstractTransactionalCommand {

+

+	/**

+	 * @generated

+	 */

+	private List myDescriptors;

+

+	/**

+	 * @generated

+	 */

+	public ComrelCreateShortcutDecorationsCommand(

+			TransactionalEditingDomain editingDomain, View parentView,

+			List viewDescriptors) {

+		super(editingDomain, "Create Shortcuts", getWorkspaceFiles(parentView)); //$NON-NLS-1$

+		myDescriptors = viewDescriptors;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComrelCreateShortcutDecorationsCommand(

+			TransactionalEditingDomain editingDomain, View parentView,

+			CreateViewRequest.ViewDescriptor viewDescriptor) {

+		this(editingDomain, parentView, Collections

+				.singletonList(viewDescriptor));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		for (Iterator it = myDescriptors.iterator(); it.hasNext();) {

+			CreateViewRequest.ViewDescriptor nextDescriptor = (CreateViewRequest.ViewDescriptor) it

+					.next();

+			View view = (View) nextDescriptor.getAdapter(View.class);

+			if (view != null && view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE

+						.createEAnnotation();

+				shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$

+				shortcutAnnotation.getDetails().put(

+						"modelID", CompositeRefactoringEditPart.MODEL_ID); //$NON-NLS-1$

+				view.getEAnnotations().add(shortcutAnnotation);

+			}

+		}

+		return CommandResult.newOKCommandResult();

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionCheckCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionCheckCreateCommand.java
new file mode 100644
index 0000000..c8506be
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionCheckCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionCheck;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class ConditionCheckCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionCheckCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getIf() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionCheck newElement = ComrelFactory.eINSTANCE

+				.createConditionCheck();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setIf(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionCheck newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit2CreateCommand.java
new file mode 100644
index 0000000..8a9934c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit2CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CartesianQueuedUnit container = (CartesianQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionalUnit newElement = ComrelFactory.eINSTANCE

+				.createConditionalUnit();

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionalUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit3CreateCommand.java
new file mode 100644
index 0000000..fcc341e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit3CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ParallelQueuedUnit container = (ParallelQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnits() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionalUnit newElement = ComrelFactory.eINSTANCE

+				.createConditionalUnit();

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnits(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionalUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit4CreateCommand.java
new file mode 100644
index 0000000..3225eec
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit4CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleQueuedUnit container = (SingleQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionalUnit newElement = ComrelFactory.eINSTANCE

+				.createConditionalUnit();

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionalUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit5CreateCommand.java
new file mode 100644
index 0000000..0619a57
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit5CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionalUnit newElement = ComrelFactory.eINSTANCE

+				.createConditionalUnit();

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getRefactoringUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionalUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit6CreateCommand.java
new file mode 100644
index 0000000..682a4c8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit6CreateCommand.java
@@ -0,0 +1,95 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getThen() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionalUnit newElement = ComrelFactory.eINSTANCE

+				.createConditionalUnit();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setThen(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionalUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit7CreateCommand.java
new file mode 100644
index 0000000..07be1d4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnit7CreateCommand.java
@@ -0,0 +1,95 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getElse() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionalUnit newElement = ComrelFactory.eINSTANCE

+				.createConditionalUnit();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setElse(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionalUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnitCreateCommand.java
new file mode 100644
index 0000000..731ffa0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ConditionalUnitCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CompositeRefactoring container = (CompositeRefactoring) getElementToEdit();

+		if (container.getMainRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ConditionalUnit newElement = ComrelFactory.eINSTANCE

+				.createConditionalUnit();

+

+		CompositeRefactoring owner = (CompositeRefactoring) getElementToEdit();

+		owner.setMainRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConditionalUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit2CreateCommand.java
new file mode 100644
index 0000000..0417751
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit2CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFeatureUnit;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFeatureHelper helper = cr.getMultiFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFeatureUnit(helper);

+		} else {

+			newElement = factory.createMultiFeatureUnit();

+		}

+		/* end of change */

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit3CreateCommand.java
new file mode 100644
index 0000000..06e2969
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit3CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.MultiFeatureUnit;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFeatureHelper helper = cr.getMultiFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFeatureUnit(helper);

+		} else {

+			newElement = factory.createMultiFeatureUnit();

+		}

+		/* end of change */

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit4CreateCommand.java
new file mode 100644
index 0000000..32fcc87
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit4CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFeatureUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFeatureHelper helper = cr.getMultiFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFeatureUnit(helper);

+		} else {

+			newElement = factory.createMultiFeatureUnit();

+		}

+		/* end of change */

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit5CreateCommand.java
new file mode 100644
index 0000000..6ac043d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnit5CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFeatureUnit;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFeatureHelper helper = cr.getMultiFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFeatureUnit(helper);

+		} else {

+			newElement = factory.createMultiFeatureUnit();

+		}

+		/* end of change */

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnitCreateCommand.java
new file mode 100644
index 0000000..90944b0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFeatureUnitCreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFeatureUnit;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFeatureHelper helper = cr.getMultiFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFeatureUnit(helper);

+		} else {

+			newElement = factory.createMultiFeatureUnit();

+		}

+		/* end of change */

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit2CreateCommand.java
new file mode 100644
index 0000000..46cffc5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit2CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFilterUnit;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFilterHelper helper = cr.getMultiFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFilterUnit(helper);

+		} else {

+			newElement = factory.createMultiFilterUnit();

+		}

+		/* end of change */

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit3CreateCommand.java
new file mode 100644
index 0000000..0955cee
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit3CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.MultiFilterUnit;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFilterHelper helper = cr.getMultiFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFilterUnit(helper);

+		} else {

+			newElement = factory.createMultiFilterUnit();

+		}

+		/* end of change */

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit4CreateCommand.java
new file mode 100644
index 0000000..9cfd34f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit4CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFilterUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFilterHelper helper = cr.getMultiFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFilterUnit(helper);

+		} else {

+			newElement = factory.createMultiFilterUnit();

+		}

+		/* end of change */

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit5CreateCommand.java
new file mode 100644
index 0000000..2c140b6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnit5CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFilterUnit;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFilterHelper helper = cr.getMultiFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFilterUnit(helper);

+		} else {

+			newElement = factory.createMultiFilterUnit();

+		}

+		/* end of change */

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnitCreateCommand.java
new file mode 100644
index 0000000..7a8ea82
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiFilterUnitCreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiFilterUnit;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.MultiFilterHelper helper = cr.getMultiFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.MultiFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createMultiFilterUnit(helper);

+		} else {

+			newElement = factory.createMultiFilterUnit();

+		}

+		/* end of change */

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort2CreateCommand.java
new file mode 100644
index 0000000..d088aaa
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort2CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiInputPort;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class MultiInputPort2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ParallelQueuedUnit container = (ParallelQueuedUnit) getElementToEdit();

+		if (container.getMultiInputPorts().size() >= 2) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.getMultiInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort3CreateCommand.java
new file mode 100644
index 0000000..5b52c7c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort3CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiInputPort;

+import comrel.SingleFeatureUnit;

+

+/**

+ * @generated

+ */

+public class MultiInputPort3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		SingleFeatureUnit owner = (SingleFeatureUnit) getElementToEdit();

+		owner.getSecondaryInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort4CreateCommand.java
new file mode 100644
index 0000000..f265336
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort4CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiFeatureUnit;

+import comrel.MultiInputPort;

+

+/**

+ * @generated

+ */

+public class MultiInputPort4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		MultiFeatureUnit owner = (MultiFeatureUnit) getElementToEdit();

+		owner.getSecondaryInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort5CreateCommand.java
new file mode 100644
index 0000000..b9f6f35
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort5CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiInputPort;

+import comrel.SingleFilterUnit;

+

+/**

+ * @generated

+ */

+public class MultiInputPort5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleFilterUnit container = (SingleFilterUnit) getElementToEdit();

+		if (container.getInputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		SingleFilterUnit owner = (SingleFilterUnit) getElementToEdit();

+		owner.setInputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort6CreateCommand.java
new file mode 100644
index 0000000..d504d50
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort6CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiFilterUnit;

+import comrel.MultiInputPort;

+

+/**

+ * @generated

+ */

+public class MultiInputPort6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		MultiFilterUnit container = (MultiFilterUnit) getElementToEdit();

+		if (container.getInputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		MultiFilterUnit owner = (MultiFilterUnit) getElementToEdit();

+		owner.setInputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort7CreateCommand.java
new file mode 100644
index 0000000..f4c6dfb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort7CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiInputPort;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class MultiInputPort7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleQueuedUnit container = (SingleQueuedUnit) getElementToEdit();

+		if (container.getMultiInputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.setMultiInputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort8CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort8CreateCommand.java
new file mode 100644
index 0000000..e83a845
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort8CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiInputPort;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class MultiInputPort8CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort8CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort9CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort9CreateCommand.java
new file mode 100644
index 0000000..ffe2401
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPort9CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.MultiInputPort;

+

+/**

+ * @generated

+ */

+public class MultiInputPort9CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort9CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.getInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPortCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPortCreateCommand.java
new file mode 100644
index 0000000..2813e50
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiInputPortCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.MultiInputPort;

+

+/**

+ * @generated

+ */

+public class MultiInputPortCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CartesianQueuedUnit container = (CartesianQueuedUnit) getElementToEdit();

+		if (container.getMultiInputPorts().size() >= 2) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiInputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiInputPort();

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.getMultiInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiOutputPort2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiOutputPort2CreateCommand.java
new file mode 100644
index 0000000..7be947d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiOutputPort2CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiFilterUnit;

+import comrel.MultiOutputPort;

+

+/**

+ * @generated

+ */

+public class MultiOutputPort2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPort2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		MultiFilterUnit container = (MultiFilterUnit) getElementToEdit();

+		if (container.getOutputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiOutputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiOutputPort();

+

+		MultiFilterUnit owner = (MultiFilterUnit) getElementToEdit();

+		owner.setOutputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiOutputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiOutputPortCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiOutputPortCreateCommand.java
new file mode 100644
index 0000000..3e6dd23
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiOutputPortCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiFeatureUnit;

+import comrel.MultiOutputPort;

+

+/**

+ * @generated

+ */

+public class MultiOutputPortCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPortCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		MultiFeatureUnit container = (MultiFeatureUnit) getElementToEdit();

+		if (container.getOutputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		MultiOutputPort newElement = ComrelFactory.eINSTANCE

+				.createMultiOutputPort();

+

+		MultiFeatureUnit owner = (MultiFeatureUnit) getElementToEdit();

+		owner.setOutputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiOutputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiPortMappingCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiPortMappingCreateCommand.java
new file mode 100644
index 0000000..1785542
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiPortMappingCreateCommand.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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 comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiInputPort;

+import comrel.MultiPort;

+import comrel.MultiPortMapping;

+import comrel.diagram.edit.policies.ComrelBaseItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class MultiPortMappingCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final EObject source;

+

+	/**

+	 * @generated

+	 */

+	private final EObject target;

+

+	/**

+	 * @generated

+	 */

+	private final CompositeRefactoring container;

+

+	/**

+	 * @generated

+	 */

+	public MultiPortMappingCreateCommand(CreateRelationshipRequest request,

+			EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if (source == null && target == null) {

+			return false;

+		}

+		if (source != null && false == source instanceof MultiPort) {

+			return false;

+		}

+		if (target != null && false == target instanceof MultiInputPort) {

+			return false;

+		}

+		if (getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if (getContainer() == null) {

+			return false;

+		}

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canCreateMultiPortMapping_4002(getContainer(), getSource(),

+						getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		if (!canExecute()) {

+			throw new ExecutionException(

+					"Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		MultiPortMapping newElement = ComrelFactory.eINSTANCE

+				.createMultiPortMapping();

+		getContainer().getPortMappings().add(newElement);

+		newElement.setSource(getSource());

+		newElement.setTarget(getTarget());

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiPortMapping newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE,

+				getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET,

+				getTarget());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiPort getSource() {

+		return (MultiPort) source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiInputPort getTarget() {

+		return (MultiInputPort) target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CompositeRefactoring getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * @generated

+	 */

+	private static CompositeRefactoring deduceContainer(EObject source,

+			EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null; element = element

+				.eContainer()) {

+			if (element instanceof CompositeRefactoring) {

+				return (CompositeRefactoring) element;

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiPortMappingReorientCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiPortMappingReorientCommand.java
new file mode 100644
index 0000000..e661cb1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiPortMappingReorientCommand.java
@@ -0,0 +1,170 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+

+import comrel.CompositeRefactoring;

+import comrel.MultiInputPort;

+import comrel.MultiPort;

+import comrel.MultiPortMapping;

+import comrel.diagram.edit.policies.ComrelBaseItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class MultiPortMappingReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public MultiPortMappingReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if (false == getElementToEdit() instanceof MultiPortMapping) {

+			return false;

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if (!(oldEnd instanceof MultiPort && newEnd instanceof MultiPort)) {

+			return false;

+		}

+		MultiInputPort target = getLink().getTarget();

+		if (!(getLink().eContainer() instanceof CompositeRefactoring)) {

+			return false;

+		}

+		CompositeRefactoring container = (CompositeRefactoring) getLink()

+				.eContainer();

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canExistMultiPortMapping_4002(container, getLink(),

+						getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if (!(oldEnd instanceof MultiInputPort && newEnd instanceof MultiInputPort)) {

+			return false;

+		}

+		MultiPort source = getLink().getSource();

+		if (!(getLink().eContainer() instanceof CompositeRefactoring)) {

+			return false;

+		}

+		CompositeRefactoring container = (CompositeRefactoring) getLink()

+				.eContainer();

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canExistMultiPortMapping_4002(container, getLink(), source,

+						getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		if (!canExecute()) {

+			throw new ExecutionException(

+					"Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().setSource(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().setTarget(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiPortMapping getLink() {

+		return (MultiPortMapping) getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiPort getOldSource() {

+		return (MultiPort) oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiPort getNewSource() {

+		return (MultiPort) newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiInputPort getOldTarget() {

+		return (MultiInputPort) oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiInputPort getNewTarget() {

+		return (MultiInputPort) newEnd;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiSinglePortMappingCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiSinglePortMappingCreateCommand.java
new file mode 100644
index 0000000..5f8dc49
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiSinglePortMappingCreateCommand.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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 comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MultiPort;

+import comrel.MultiSinglePortMapping;

+import comrel.SingleInputPort;

+import comrel.diagram.edit.policies.ComrelBaseItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class MultiSinglePortMappingCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final EObject source;

+

+	/**

+	 * @generated

+	 */

+	private final EObject target;

+

+	/**

+	 * @generated

+	 */

+	private final CompositeRefactoring container;

+

+	/**

+	 * @generated

+	 */

+	public MultiSinglePortMappingCreateCommand(

+			CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if (source == null && target == null) {

+			return false;

+		}

+		if (source != null && false == source instanceof MultiPort) {

+			return false;

+		}

+		if (target != null && false == target instanceof SingleInputPort) {

+			return false;

+		}

+		if (getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if (getContainer() == null) {

+			return false;

+		}

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canCreateMultiSinglePortMapping_4003(getContainer(),

+						getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		if (!canExecute()) {

+			throw new ExecutionException(

+					"Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		MultiSinglePortMapping newElement = ComrelFactory.eINSTANCE

+				.createMultiSinglePortMapping();

+		getContainer().getPortMappings().add(newElement);

+		newElement.setSource(getSource());

+		newElement.setTarget(getTarget());

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(MultiSinglePortMapping newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE,

+				getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET,

+				getTarget());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiPort getSource() {

+		return (MultiPort) source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SingleInputPort getTarget() {

+		return (SingleInputPort) target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CompositeRefactoring getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * @generated

+	 */

+	private static CompositeRefactoring deduceContainer(EObject source,

+			EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null; element = element

+				.eContainer()) {

+			if (element instanceof CompositeRefactoring) {

+				return (CompositeRefactoring) element;

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiSinglePortMappingReorientCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiSinglePortMappingReorientCommand.java
new file mode 100644
index 0000000..bd86694
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/MultiSinglePortMappingReorientCommand.java
@@ -0,0 +1,171 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+

+import comrel.CompositeRefactoring;

+import comrel.MultiPort;

+import comrel.MultiSinglePortMapping;

+import comrel.SingleInputPort;

+import comrel.diagram.edit.policies.ComrelBaseItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class MultiSinglePortMappingReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public MultiSinglePortMappingReorientCommand(

+			ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if (false == getElementToEdit() instanceof MultiSinglePortMapping) {

+			return false;

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if (!(oldEnd instanceof MultiPort && newEnd instanceof MultiPort)) {

+			return false;

+		}

+		SingleInputPort target = getLink().getTarget();

+		if (!(getLink().eContainer() instanceof CompositeRefactoring)) {

+			return false;

+		}

+		CompositeRefactoring container = (CompositeRefactoring) getLink()

+				.eContainer();

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canExistMultiSinglePortMapping_4003(container, getLink(),

+						getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if (!(oldEnd instanceof SingleInputPort && newEnd instanceof SingleInputPort)) {

+			return false;

+		}

+		MultiPort source = getLink().getSource();

+		if (!(getLink().eContainer() instanceof CompositeRefactoring)) {

+			return false;

+		}

+		CompositeRefactoring container = (CompositeRefactoring) getLink()

+				.eContainer();

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canExistMultiSinglePortMapping_4003(container, getLink(),

+						source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		if (!canExecute()) {

+			throw new ExecutionException(

+					"Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().setSource(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().setTarget(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiSinglePortMapping getLink() {

+		return (MultiSinglePortMapping) getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiPort getOldSource() {

+		return (MultiPort) oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MultiPort getNewSource() {

+		return (MultiPort) newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SingleInputPort getOldTarget() {

+		return (SingleInputPort) oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SingleInputPort getNewTarget() {

+		return (SingleInputPort) newEnd;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit2CreateCommand.java
new file mode 100644
index 0000000..6137256
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit2CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CartesianQueuedUnit container = (CartesianQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ParallelQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createParallelQueuedUnit();

+		newElement.init();

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ParallelQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit3CreateCommand.java
new file mode 100644
index 0000000..3db9c1e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit3CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getThen() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ParallelQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createParallelQueuedUnit();

+		newElement.init();

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setThen(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ParallelQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit4CreateCommand.java
new file mode 100644
index 0000000..9eaac37
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit4CreateCommand.java
@@ -0,0 +1,95 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ParallelQueuedUnit container = (ParallelQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnits() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ParallelQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createParallelQueuedUnit();

+		newElement.init();

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnits(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ParallelQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit5CreateCommand.java
new file mode 100644
index 0000000..25e8263
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit5CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleQueuedUnit container = (SingleQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ParallelQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createParallelQueuedUnit();

+		newElement.init();

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ParallelQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit6CreateCommand.java
new file mode 100644
index 0000000..94ab2fd
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit6CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ParallelQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createParallelQueuedUnit();

+		newElement.init();

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getRefactoringUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ParallelQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit7CreateCommand.java
new file mode 100644
index 0000000..7744b8a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnit7CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getElse() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ParallelQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createParallelQueuedUnit();

+		newElement.init();

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setElse(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ParallelQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnitCreateCommand.java
new file mode 100644
index 0000000..0409a2e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/ParallelQueuedUnitCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CompositeRefactoring container = (CompositeRefactoring) getElementToEdit();

+		if (container.getMainRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		ParallelQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createParallelQueuedUnit();

+		newElement.init();

+		CompositeRefactoring owner = (CompositeRefactoring) getElementToEdit();

+		owner.setMainRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ParallelQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit2CreateCommand.java
new file mode 100644
index 0000000..2fea1d9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit2CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class SequentialUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CartesianQueuedUnit container = (CartesianQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SequentialUnit newElement = ComrelFactory.eINSTANCE

+				.createSequentialUnit();

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SequentialUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit3CreateCommand.java
new file mode 100644
index 0000000..525889c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit3CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class SequentialUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ParallelQueuedUnit container = (ParallelQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnits() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SequentialUnit newElement = ComrelFactory.eINSTANCE

+				.createSequentialUnit();

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnits(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SequentialUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit4CreateCommand.java
new file mode 100644
index 0000000..7aaa287
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit4CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SequentialUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleQueuedUnit container = (SingleQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SequentialUnit newElement = ComrelFactory.eINSTANCE

+				.createSequentialUnit();

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SequentialUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit5CreateCommand.java
new file mode 100644
index 0000000..a403d49
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit5CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class SequentialUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getThen() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SequentialUnit newElement = ComrelFactory.eINSTANCE

+				.createSequentialUnit();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setThen(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SequentialUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit6CreateCommand.java
new file mode 100644
index 0000000..3a1f3e1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit6CreateCommand.java
@@ -0,0 +1,91 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class SequentialUnit6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SequentialUnit newElement = ComrelFactory.eINSTANCE

+				.createSequentialUnit();

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getRefactoringUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SequentialUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit7CreateCommand.java
new file mode 100644
index 0000000..14cd78b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnit7CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class SequentialUnit7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getElse() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SequentialUnit newElement = ComrelFactory.eINSTANCE

+				.createSequentialUnit();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setElse(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SequentialUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnitCreateCommand.java
new file mode 100644
index 0000000..024b33e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SequentialUnitCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+

+/**

+ * @generated

+ */

+public class SequentialUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CompositeRefactoring container = (CompositeRefactoring) getElementToEdit();

+		if (container.getMainRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SequentialUnit newElement = ComrelFactory.eINSTANCE

+				.createSequentialUnit();

+

+		CompositeRefactoring owner = (CompositeRefactoring) getElementToEdit();

+		owner.setMainRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SequentialUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit2CreateCommand.java
new file mode 100644
index 0000000..1343097
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit2CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+import comrel.SingleFeatureUnit;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFeatureHelper helper = cr.getSingleFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFeatureUnit(helper);

+		} else {

+			newElement = factory.createSingleFeatureUnit();

+		}

+		/* end of change */

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit3CreateCommand.java
new file mode 100644
index 0000000..408ac4b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit3CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SingleFeatureUnit;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFeatureHelper helper = cr.getSingleFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFeatureUnit(helper);

+		} else {

+			newElement = factory.createSingleFeatureUnit();

+		}

+		/* end of change */

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit4CreateCommand.java
new file mode 100644
index 0000000..0a67a30
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit4CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SingleFeatureUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFeatureHelper helper = cr.getSingleFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFeatureUnit(helper);

+		} else {

+			newElement = factory.createSingleFeatureUnit();

+		}

+		/* end of change */

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit5CreateCommand.java
new file mode 100644
index 0000000..42dfc3b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnit5CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+import comrel.SingleFeatureUnit;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFeatureHelper helper = cr.getSingleFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFeatureUnit(helper);

+		} else {

+			newElement = factory.createSingleFeatureUnit();

+		}

+		/* end of change */

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnitCreateCommand.java
new file mode 100644
index 0000000..053a886
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFeatureUnitCreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SingleFeatureUnit;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFeatureHelper helper = cr.getSingleFeatureHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFeatureUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFeatureUnit(helper);

+		} else {

+			newElement = factory.createSingleFeatureUnit();

+		}

+		/* end of change */

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFeatureUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit2CreateCommand.java
new file mode 100644
index 0000000..45d18ef
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit2CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+import comrel.SingleFilterUnit;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFilterHelper helper = cr.getSingleFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFilterUnit(helper);

+		} else {

+			newElement = factory.createSingleFilterUnit();

+		}

+		/* end of change */

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit3CreateCommand.java
new file mode 100644
index 0000000..526991d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit3CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SingleFilterUnit;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFilterHelper helper = cr.getSingleFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFilterUnit(helper);

+		} else {

+			newElement = factory.createSingleFilterUnit();

+		}

+		/* end of change */

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit4CreateCommand.java
new file mode 100644
index 0000000..ea75103
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit4CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SingleFilterUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFilterHelper helper = cr.getSingleFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFilterUnit(helper);

+		} else {

+			newElement = factory.createSingleFilterUnit();

+		}

+		/* end of change */

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit5CreateCommand.java
new file mode 100644
index 0000000..02d9a08
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnit5CreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+import comrel.SingleFilterUnit;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFilterHelper helper = cr.getSingleFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFilterUnit(helper);

+		} else {

+			newElement = factory.createSingleFilterUnit();

+		}

+		/* end of change */

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnitCreateCommand.java
new file mode 100644
index 0000000..9a6549d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleFilterUnitCreateCommand.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SingleFilterUnit;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		/*

+		 * changes: Liest aus einem Request die ID des Helpers und

+		 * erstellt anhand dessen die HelperUnit

+		 */

+		CreateElementRequest request = ((CreateElementRequest) getRequest());

+		String helperId = (String) request.getParameters().get(

+				comrel.diagram.part.ComrelPaletteFactory.UNIT_ID);

+		comrel.ComrelFactory factory = comrel.ComrelFactory.eINSTANCE;

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		while (container.eContainer() != null) {

+			container = container.eContainer();

+		}

+		CompositeRefactoring cr = (CompositeRefactoring) container;

+		comrel.SingleFilterHelper helper = cr.getSingleFilterHelper(helperId);

+		if (helper != null && !cr.getHelper().contains(helper)) {

+			cr.getHelper().add(helper);

+		}

+		comrel.SingleFilterUnit newElement;

+		if (helper != null) {

+			newElement = factory.createSingleFilterUnit(helper);

+		} else {

+			newElement = factory.createSingleFilterUnit();

+		}

+		/* end of change */

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.getHelperUnits().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleFilterUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort2CreateCommand.java
new file mode 100644
index 0000000..9ba7626
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort2CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPort2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.getSingleInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort3CreateCommand.java
new file mode 100644
index 0000000..68286ec
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort3CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPort3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.getSingleInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort4CreateCommand.java
new file mode 100644
index 0000000..e27d1d0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort4CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SingleFeatureUnit;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPort4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleFeatureUnit container = (SingleFeatureUnit) getElementToEdit();

+		if (container.getInputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		SingleFeatureUnit owner = (SingleFeatureUnit) getElementToEdit();

+		owner.setInputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort5CreateCommand.java
new file mode 100644
index 0000000..1965ac6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort5CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.MultiFeatureUnit;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPort5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		MultiFeatureUnit container = (MultiFeatureUnit) getElementToEdit();

+		if (container.getInputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		MultiFeatureUnit owner = (MultiFeatureUnit) getElementToEdit();

+		owner.setInputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort6CreateCommand.java
new file mode 100644
index 0000000..2acb57a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort6CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SingleInputPort;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleInputPort6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.getSingleInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort7CreateCommand.java
new file mode 100644
index 0000000..ba6e5ad
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort7CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPort7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort8CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort8CreateCommand.java
new file mode 100644
index 0000000..5798cc8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort8CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPort8CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort8CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.getInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort9CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort9CreateCommand.java
new file mode 100644
index 0000000..e9b8755
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPort9CreateCommand.java
@@ -0,0 +1,102 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.ComrelFactory;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPort9CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort9CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		AtomicUnit owner = (AtomicUnit) getElementToEdit();

+		/*

+		 * Begin Changes: Only the AtomicRefactoirngInputPorts are alloweded

+		 */

+		if (owner.getInputPorts().size() != owner.getModelRefactoring()

+				.getInputPorts().size()) {

+			SingleInputPort newElement = ComrelFactory.eINSTANCE

+					.createSingleInputPort();

+

+			owner.getInputPorts().add(newElement);

+

+			doConfigure(newElement, monitor, info);

+

+			((CreateElementRequest) getRequest()).setNewElement(newElement);

+			return CommandResult.newOKCommandResult(newElement);

+		}

+		return CommandResult.newCancelledCommandResult();

+		/*

+		 * End Changes!

+		 */

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPortCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPortCreateCommand.java
new file mode 100644
index 0000000..0e66242
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleInputPortCreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ModelRefactoring;

+import comrel.SingleInputPort;

+

+/**

+ * @generated

+ */

+public class SingleInputPortCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleInputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleInputPort();

+

+		ModelRefactoring owner = (ModelRefactoring) getElementToEdit();

+		owner.getInputPorts().add(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleInputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleOutputPort2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleOutputPort2CreateCommand.java
new file mode 100644
index 0000000..0732846
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleOutputPort2CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SingleFilterUnit;

+import comrel.SingleOutputPort;

+

+/**

+ * @generated

+ */

+public class SingleOutputPort2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPort2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleFilterUnit container = (SingleFilterUnit) getElementToEdit();

+		if (container.getOutputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleOutputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleOutputPort();

+

+		SingleFilterUnit owner = (SingleFilterUnit) getElementToEdit();

+		owner.setOutputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleOutputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleOutputPortCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleOutputPortCreateCommand.java
new file mode 100644
index 0000000..f44d4e0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleOutputPortCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SingleFeatureUnit;

+import comrel.SingleOutputPort;

+

+/**

+ * @generated

+ */

+public class SingleOutputPortCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPortCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleFeatureUnit container = (SingleFeatureUnit) getElementToEdit();

+		if (container.getOutputPort() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleOutputPort newElement = ComrelFactory.eINSTANCE

+				.createSingleOutputPort();

+

+		SingleFeatureUnit owner = (SingleFeatureUnit) getElementToEdit();

+		owner.setOutputPort(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleOutputPort newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SinglePortMappingCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SinglePortMappingCreateCommand.java
new file mode 100644
index 0000000..2cfe773
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SinglePortMappingCreateCommand.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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 comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SingleInputPort;

+import comrel.SinglePort;

+import comrel.SinglePortMapping;

+import comrel.diagram.edit.policies.ComrelBaseItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class SinglePortMappingCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final EObject source;

+

+	/**

+	 * @generated

+	 */

+	private final EObject target;

+

+	/**

+	 * @generated

+	 */

+	private final CompositeRefactoring container;

+

+	/**

+	 * @generated

+	 */

+	public SinglePortMappingCreateCommand(CreateRelationshipRequest request,

+			EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if (source == null && target == null) {

+			return false;

+		}

+		if (source != null && false == source instanceof SinglePort) {

+			return false;

+		}

+		if (target != null && false == target instanceof SingleInputPort) {

+			return false;

+		}

+		if (getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if (getContainer() == null) {

+			return false;

+		}

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canCreateSinglePortMapping_4001(getContainer(), getSource(),

+						getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		if (!canExecute()) {

+			throw new ExecutionException(

+					"Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		SinglePortMapping newElement = ComrelFactory.eINSTANCE

+				.createSinglePortMapping();

+		getContainer().getPortMappings().add(newElement);

+		newElement.setSource(getSource());

+		newElement.setTarget(getTarget());

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SinglePortMapping newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE,

+				getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET,

+				getTarget());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SinglePort getSource() {

+		return (SinglePort) source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SingleInputPort getTarget() {

+		return (SingleInputPort) target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CompositeRefactoring getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * @generated

+	 */

+	private static CompositeRefactoring deduceContainer(EObject source,

+			EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null; element = element

+				.eContainer()) {

+			if (element instanceof CompositeRefactoring) {

+				return (CompositeRefactoring) element;

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SinglePortMappingReorientCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SinglePortMappingReorientCommand.java
new file mode 100644
index 0000000..c7a3afb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SinglePortMappingReorientCommand.java
@@ -0,0 +1,170 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+

+import comrel.CompositeRefactoring;

+import comrel.SingleInputPort;

+import comrel.SinglePort;

+import comrel.SinglePortMapping;

+import comrel.diagram.edit.policies.ComrelBaseItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class SinglePortMappingReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public SinglePortMappingReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if (false == getElementToEdit() instanceof SinglePortMapping) {

+			return false;

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if (!(oldEnd instanceof SinglePort && newEnd instanceof SinglePort)) {

+			return false;

+		}

+		SingleInputPort target = getLink().getTarget();

+		if (!(getLink().eContainer() instanceof CompositeRefactoring)) {

+			return false;

+		}

+		CompositeRefactoring container = (CompositeRefactoring) getLink()

+				.eContainer();

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canExistSinglePortMapping_4001(container, getLink(),

+						getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if (!(oldEnd instanceof SingleInputPort && newEnd instanceof SingleInputPort)) {

+			return false;

+		}

+		SinglePort source = getLink().getSource();

+		if (!(getLink().eContainer() instanceof CompositeRefactoring)) {

+			return false;

+		}

+		CompositeRefactoring container = (CompositeRefactoring) getLink()

+				.eContainer();

+		return ComrelBaseItemSemanticEditPolicy.getLinkConstraints()

+				.canExistSinglePortMapping_4001(container, getLink(), source,

+						getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		if (!canExecute()) {

+			throw new ExecutionException(

+					"Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().setSource(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().setTarget(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SinglePortMapping getLink() {

+		return (SinglePortMapping) getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SinglePort getOldSource() {

+		return (SinglePort) oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SinglePort getNewSource() {

+		return (SinglePort) newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SingleInputPort getOldTarget() {

+		return (SingleInputPort) oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected SingleInputPort getNewTarget() {

+		return (SingleInputPort) newEnd;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit2CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit2CreateCommand.java
new file mode 100644
index 0000000..592be49
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit2CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CartesianQueuedUnit;

+import comrel.ComrelFactory;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit2CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit2CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CartesianQueuedUnit container = (CartesianQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createSingleQueuedUnit();

+

+		CartesianQueuedUnit owner = (CartesianQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit3CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit3CreateCommand.java
new file mode 100644
index 0000000..c198260
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit3CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ParallelQueuedUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit3CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit3CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ParallelQueuedUnit container = (ParallelQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnits() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createSingleQueuedUnit();

+

+		ParallelQueuedUnit owner = (ParallelQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnits(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit4CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit4CreateCommand.java
new file mode 100644
index 0000000..9de9e9b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit4CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit4CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit4CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getThen() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createSingleQueuedUnit();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setThen(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit5CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit5CreateCommand.java
new file mode 100644
index 0000000..adfc0ef
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit5CreateCommand.java
@@ -0,0 +1,95 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit5CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit5CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		SingleQueuedUnit container = (SingleQueuedUnit) getElementToEdit();

+		if (container.getRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createSingleQueuedUnit();

+

+		SingleQueuedUnit owner = (SingleQueuedUnit) getElementToEdit();

+		owner.setRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit6CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit6CreateCommand.java
new file mode 100644
index 0000000..9616b65
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit6CreateCommand.java
@@ -0,0 +1,92 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.SequentialUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit6CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit6CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createSingleQueuedUnit();

+

+		SequentialUnit owner = (SequentialUnit) getElementToEdit();

+		owner.getRefactoringUnits().add(newElement);

+		owner.updateSeqExecutionOrder();

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit7CreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit7CreateCommand.java
new file mode 100644
index 0000000..5d12361
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnit7CreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.ComrelFactory;

+import comrel.ConditionalUnit;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit7CreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit7CreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		ConditionalUnit container = (ConditionalUnit) getElementToEdit();

+		if (container.getElse() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createSingleQueuedUnit();

+

+		ConditionalUnit owner = (ConditionalUnit) getElementToEdit();

+		owner.setElse(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnitCreateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnitCreateCommand.java
new file mode 100644
index 0000000..f311bac
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/SingleQueuedUnitCreateCommand.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+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.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.SingleQueuedUnit;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest) getRequest())

+				.getContainer();

+		if (container instanceof View) {

+			container = ((View) container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		CompositeRefactoring container = (CompositeRefactoring) getElementToEdit();

+		if (container.getMainRefactoringUnit() != null) {

+			return false;

+		}

+		return true;

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		SingleQueuedUnit newElement = ComrelFactory.eINSTANCE

+				.createSingleQueuedUnit();

+

+		CompositeRefactoring owner = (CompositeRefactoring) getElementToEdit();

+		owner.setMainRefactoringUnit(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest) getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SingleQueuedUnit newElement,

+			IProgressMonitor monitor, IAdaptable info)

+			throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest) getRequest())

+				.getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(

+				getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest) getRequest())

+				.getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType

+				.getEditCommand(configureRequest);

+		if (configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/custom/CustomDestroyElementCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/custom/CustomDestroyElementCommand.java
new file mode 100644
index 0000000..87b9b3b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/commands/custom/CustomDestroyElementCommand.java
@@ -0,0 +1,146 @@
+/**

+ * 

+ */

+package comrel.diagram.edit.commands.custom;

+

+import java.util.ArrayList;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.Helper;

+import comrel.HelperUnit;

+import comrel.ModelRefactoring;

+import comrel.MultiPortMapping;

+import comrel.MultiSinglePortMapping;

+import comrel.Port;

+import comrel.PortMapping;

+import comrel.SinglePortMapping;

+import comrel.util.ComrelUtil;

+

+/**

+ * @author Gerrit

+ * Selbstdefiniertes DestroyElementCommand, um eventuell bestimmte 

+ * Dinge noch zu machen, bevor das Element zerstört wird.

+ */

+public class CustomDestroyElementCommand extends DestroyElementCommand {

+

+	boolean condition = true;

+	ModelRefactoring ref= null;

+	Port p = null;

+	Helper helper= null;

+	EObject container = null;

+	

+	

+	public CustomDestroyElementCommand(DestroyElementRequest request,boolean condition) {

+		super(request);

+		this.condition = condition;

+		this.container = request.getContainer();

+	}

+	

+	public CustomDestroyElementCommand(DestroyElementRequest request,Port port, boolean condition) {

+		super(request);

+		this.condition = condition;

+		this.container = request.getContainer();

+		this.p=port;

+	}

+	

+	public CustomDestroyElementCommand(DestroyElementRequest request,ModelRefactoring ref) {

+		super(request);

+		this.ref=ref;

+		this.container = request.getContainer();

+	}

+	

+	public CustomDestroyElementCommand(DestroyElementRequest request,Helper helper) {

+		super(request);

+		this.helper = helper;

+		this.container = request.getContainer();

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand#canExecute()

+	 */

+	@Override

+	public boolean canExecute() {

+		return condition;

+	}

+

+	@Override

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+			IAdaptable info) throws ExecutionException {

+		

+		CommandResult result = super.doExecuteWithResult(monitor, info);

+		CompositeRefactoring cr = (CompositeRefactoring)ComrelUtil.getContainedCompositeRefactoring(container);

+		ArrayList<PortMapping> mappings = new ArrayList<PortMapping>();

+		ArrayList<Port> ports = new ArrayList<Port>();

+		if(ref != null) {

+			AtomicUnit context = (AtomicUnit) getElementToDestroy();

+			ports.addAll(context.getInputPorts());

+			for(PortMapping m : cr.getPortMappings()) {

+				if(ports.contains(m.getSource()) || ports.contains(m.getTarget())) {

+					setSourceTargetNull(m);

+					mappings.add(m);

+				}

+			}

+			cr.getPortMappings().removeAll(mappings);

+			cr.getModelRefactorings().remove(ref);

+		}

+		if(helper != null) {

+			HelperUnit context = (HelperUnit) getElementToDestroy();

+			ports.add(context.getInputPort());

+			ports.add(context.getOutputPort());

+			for(PortMapping m : cr.getPortMappings()) {

+				if(ports.contains(m.getSource()) || ports.contains(m.getTarget())) {

+					setSourceTargetNull(m);

+					mappings.add(m);

+				}

+			}

+			cr.getPortMappings().removeAll(mappings);

+			cr.getHelper().remove(helper);

+		}

+		if(p != null) {

+			for(PortMapping m : cr.getPortMappings()) {

+				if(ports == m.getSource() || p == m.getTarget()) {

+					setSourceTargetNull(m);

+					mappings.add(m);

+				}

+			}

+			cr.getPortMappings().removeAll(mappings);

+		}

+		

+		cr.removeUnusedModelRefactorings();

+		cr.removeUnusedHelper();

+

+		

+		return result;

+	}

+	

+	private void setSourceTargetNull(PortMapping mapping) {

+		

+		if (mapping instanceof SinglePortMapping) {

+			SinglePortMapping m = (SinglePortMapping) mapping;

+			m.setSource(null);

+			m.setTarget(null);

+		}

+		if (mapping instanceof MultiPortMapping) {

+			MultiPortMapping m = (MultiPortMapping) mapping;

+			m.setSource(null);

+			m.setTarget(null);

+		}

+		if (mapping instanceof MultiSinglePortMapping) {

+			MultiSinglePortMapping m = (MultiSinglePortMapping) mapping;

+			m.setSource(null);

+			m.setTarget(null);

+		}

+	}

+	

+	

+	

+}
\ No newline at end of file
diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/AtomicUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/AtomicUnitEditHelper.java
new file mode 100644
index 0000000..f680c70
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/AtomicUnitEditHelper.java
@@ -0,0 +1,42 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.ModelRefactoring;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class AtomicUnitEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		if (req.getElementToDestroy() instanceof AtomicUnit) {

+			AtomicUnit context = (AtomicUnit) req.getElementToDestroy();

+			System.out.println("AtomicUnit: " + context);

+			ModelRefactoring modelRefactoring = context.getModelRefactoring();

+			System.out.println("ModelRefactoring: " + modelRefactoring);

+			CompositeRefactoring cr = (CompositeRefactoring) modelRefactoring

+					.eContainer();

+			System.out.println("CompositeRefactoring: " + cr);

+			if (cr != null) {

+				System.out.println("in use?: " + cr.modelRefactoringInUse(modelRefactoring, context));

+				if (!cr.modelRefactoringInUse(modelRefactoring, context)) {

+					System.out.println("return: new CustomDestroyElementCommand");

+					return new CustomDestroyElementCommand(req,

+							modelRefactoring);

+				}

+			}

+		}

+		System.out.println("return: super call");

+		return super.getDestroyElementCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/CartesianQueuedUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/CartesianQueuedUnitEditHelper.java
new file mode 100644
index 0000000..fa4acfc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/CartesianQueuedUnitEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/CompositeRefactoringEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/CompositeRefactoringEditHelper.java
new file mode 100644
index 0000000..34bb262
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/CompositeRefactoringEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class CompositeRefactoringEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ComrelBaseEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ComrelBaseEditHelper.java
new file mode 100644
index 0000000..8ac361c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ComrelBaseEditHelper.java
@@ -0,0 +1,128 @@
+/*

+ * 

+ */

+package comrel.diagram.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.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+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;

+

+import comrel.CompositeRefactoring;

+import comrel.Port;

+import comrel.util.ComrelUtil;

+

+/**

+ * @generated

+ */

+public class ComrelBaseEditHelper extends AbstractEditHelper {

+

+	/**

+	 * @generated

+	 */

+	public static final String EDIT_POLICY_COMMAND = "edit policy command"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final String CONTEXT_ELEMENT_TYPE = "context element type"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	protected IEditHelperAdvice[] getEditHelperAdvice(IEditCommandRequest req) {

+		if (req.getParameter(CONTEXT_ELEMENT_TYPE) instanceof IElementType) {

+			return ElementTypeRegistry.getInstance().getEditHelperAdvice(

+					(IElementType) req.getParameter(CONTEXT_ELEMENT_TYPE));

+		}

+		return super.getEditHelperAdvice(req);

+	}

+

+	/**

+	 * @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 NOT

+	 */

+	protected ICommand getCreateCommand(CreateElementRequest req) {

+		CompositeRefactoring cr = ComrelUtil

+				.getContainedCompositeRefactoring(req.getContainer());

+		if (cr != null) {

+			cr.updateVisualization();

+		}

+		return null;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected ICommand getCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		CompositeRefactoring cr = ComrelUtil

+				.getContainedCompositeRefactoring(req.getContainer());

+		if (cr != null) {

+			cr.updateVisualization();

+		}

+		return null;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		if (req.getElementToDestroy() instanceof Port) {

+			return EditHelperUtil.getPortDestroy(req);

+		}

+		CompositeRefactoring cr = ComrelUtil

+				.getContainedCompositeRefactoring(req.getContainer());

+		if (cr != null) {

+			cr.updateVisualization();

+		}

+		return null;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected ICommand getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		CompositeRefactoring cr = ComrelUtil

+				.getContainedCompositeRefactoring(req.getContainer());

+		if (cr != null) {

+			cr.updateVisualization();

+		}

+		return null;

+	}

+

+	@Override

+	public void initializeDefaultFeature(CreateElementRequest req) {

+		CompositeRefactoring cr = ComrelUtil

+				.getContainedCompositeRefactoring(req.getContainer());

+		if (cr != null) {

+			cr.updateVisualization();

+		}

+		super.initializeDefaultFeature(req);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ConditionCheckEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ConditionCheckEditHelper.java
new file mode 100644
index 0000000..5c656a2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ConditionCheckEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class ConditionCheckEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ConditionalUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ConditionalUnitEditHelper.java
new file mode 100644
index 0000000..1d1f5a6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ConditionalUnitEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/EditHelperUtil.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/EditHelperUtil.java
new file mode 100644
index 0000000..2223dbd
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/EditHelperUtil.java
@@ -0,0 +1,36 @@
+package comrel.diagram.edit.helpers;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.MultiInputPort;

+import comrel.MultiOutputPort;

+import comrel.SingleInputPort;

+import comrel.SingleOutputPort;

+

+public class EditHelperUtil {

+

+	

+	public static ICommand getPortDestroy(DestroyElementRequest req) {

+		ComrelBaseEditHelper h;

+		if(req.getElementToDestroy() instanceof SingleInputPort){

+			h = new SingleInputPortEditHelper();

+			System.out.println("in: getPortDestroy(DestroyElementRequest req)");

+			return h.getDestroyElementCommand(req);

+		}

+		if(req.getElementToDestroy() instanceof SingleOutputPort){

+			h = new SingleOutputPortEditHelper();

+			return h.getDestroyElementCommand(req);

+		}

+		if(req.getElementToDestroy() instanceof MultiInputPort){

+			h = new MultiInputPortEditHelper();

+			return h.getDestroyElementCommand(req);

+		}

+		if(req.getElementToDestroy() instanceof MultiOutputPort){

+			h = new MultiOutputPortEditHelper();

+			return h.getDestroyElementCommand(req);

+		}

+		return null;

+		

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiFeatureUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiFeatureUnitEditHelper.java
new file mode 100644
index 0000000..015d33f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiFeatureUnitEditHelper.java
@@ -0,0 +1,37 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.CompositeRefactoring;

+import comrel.Helper;

+import comrel.HelperUnit;

+import comrel.MultiFeatureUnit;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		if (req.getElementToDestroy() instanceof HelperUnit) {

+			HelperUnit context = (HelperUnit) req.getElementToDestroy();

+			Helper helper = ((MultiFeatureUnit) context)

+					.getMultiFeatureHelper();

+			CompositeRefactoring cr = (CompositeRefactoring) helper

+					.eContainer();

+			if (cr != null) {

+				if (!cr.helperInUse(helper, context)) {

+					return new CustomDestroyElementCommand(req, helper);

+				}

+			}

+		}

+		return super.getDestroyElementCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiFilterUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiFilterUnitEditHelper.java
new file mode 100644
index 0000000..b7e54d6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiFilterUnitEditHelper.java
@@ -0,0 +1,36 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.CompositeRefactoring;

+import comrel.Helper;

+import comrel.HelperUnit;

+import comrel.MultiFilterUnit;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		if (req.getElementToDestroy() instanceof HelperUnit) {

+			HelperUnit context = (HelperUnit) req.getElementToDestroy();

+			Helper helper = ((MultiFilterUnit) context).getMultiFilterHelper();

+			CompositeRefactoring refSys = (CompositeRefactoring) helper

+					.eContainer();

+			if (refSys != null) {

+				if (!refSys.helperInUse(helper, context)) {

+					return new CustomDestroyElementCommand(req, helper);

+				}

+			}

+		}

+		return super.getDestroyElementCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiInputPortEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiInputPortEditHelper.java
new file mode 100644
index 0000000..cd5bbff
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiInputPortEditHelper.java
@@ -0,0 +1,30 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.FilterUnit;

+import comrel.Port;

+import comrel.QueuedUnit;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class MultiInputPortEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		EObject container = req.getElementToDestroy().eContainer();

+		boolean condition = !(container instanceof QueuedUnit)

+				|| container == null;

+		condition &= !(container instanceof FilterUnit);

+		return new CustomDestroyElementCommand(req,

+				(Port) req.getElementToDestroy(), condition);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiOutputPortEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiOutputPortEditHelper.java
new file mode 100644
index 0000000..dc49883
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiOutputPortEditHelper.java
@@ -0,0 +1,28 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.HelperUnit;

+import comrel.Port;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class MultiOutputPortEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		EObject container = req.getElementToDestroy().eContainer();

+		boolean condition = !(container instanceof HelperUnit)

+				|| container == null;

+		return new CustomDestroyElementCommand(req,

+				(Port) req.getElementToDestroy(), condition);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiPortMappingEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiPortMappingEditHelper.java
new file mode 100644
index 0000000..96a8181
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiPortMappingEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class MultiPortMappingEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiSinglePortMappingEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiSinglePortMappingEditHelper.java
new file mode 100644
index 0000000..790fa08
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/MultiSinglePortMappingEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class MultiSinglePortMappingEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ParallelQueuedUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ParallelQueuedUnitEditHelper.java
new file mode 100644
index 0000000..8b5f29c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/ParallelQueuedUnitEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SequentialUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SequentialUnitEditHelper.java
new file mode 100644
index 0000000..6f7cbc5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SequentialUnitEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class SequentialUnitEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleFeatureUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleFeatureUnitEditHelper.java
new file mode 100644
index 0000000..91168b2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleFeatureUnitEditHelper.java
@@ -0,0 +1,37 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.CompositeRefactoring;

+import comrel.Helper;

+import comrel.HelperUnit;

+import comrel.SingleFeatureUnit;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		if (req.getElementToDestroy() instanceof HelperUnit) {

+			HelperUnit context = (HelperUnit) req.getElementToDestroy();

+			Helper helper = ((SingleFeatureUnit) context)

+					.getSingleFeatureHelper();

+			CompositeRefactoring cr = (CompositeRefactoring) helper

+					.eContainer();

+			if (cr != null) {

+				if (!cr.helperInUse(helper, context)) {

+					return new CustomDestroyElementCommand(req, helper);

+				}

+			}

+		}

+		return super.getDestroyElementCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleFilterUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleFilterUnitEditHelper.java
new file mode 100644
index 0000000..147818a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleFilterUnitEditHelper.java
@@ -0,0 +1,37 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.CompositeRefactoring;

+import comrel.Helper;

+import comrel.HelperUnit;

+import comrel.SingleFilterUnit;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		if (req.getElementToDestroy() instanceof HelperUnit) {

+			HelperUnit context = (HelperUnit) req.getElementToDestroy();

+			Helper helper = ((SingleFilterUnit) context)

+					.getSingleFilterHelper();

+			CompositeRefactoring cr = (CompositeRefactoring) helper

+					.eContainer();

+			if (cr != null) {

+				if (!cr.helperInUse(helper, context)) {

+					return new CustomDestroyElementCommand(req, helper);

+				}

+			}

+		}

+		return super.getDestroyElementCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleInputPortEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleInputPortEditHelper.java
new file mode 100644
index 0000000..dc4de99
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleInputPortEditHelper.java
@@ -0,0 +1,30 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.AtomicUnit;

+import comrel.HelperUnit;

+import comrel.Port;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class SingleInputPortEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		EObject container = req.getElementToDestroy().eContainer();

+		boolean condition = !(container instanceof AtomicUnit)

+				|| container == null;

+		condition &= !(container instanceof HelperUnit);

+		return new CustomDestroyElementCommand(req,

+				(Port) req.getElementToDestroy(), condition);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleOutputPortEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleOutputPortEditHelper.java
new file mode 100644
index 0000000..99cd151
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleOutputPortEditHelper.java
@@ -0,0 +1,28 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+

+import comrel.HelperUnit;

+import comrel.Port;

+import comrel.diagram.edit.commands.custom.CustomDestroyElementCommand;

+

+/**

+ * @generated

+ */

+public class SingleOutputPortEditHelper extends ComrelBaseEditHelper {

+

+	@Override

+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

+		EObject container = req.getElementToDestroy().eContainer();

+		boolean condition = !(container instanceof HelperUnit)

+				|| container == null;

+		return new CustomDestroyElementCommand(req,

+				(Port) req.getElementToDestroy(), condition);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SinglePortMappingEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SinglePortMappingEditHelper.java
new file mode 100644
index 0000000..d5eed52
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SinglePortMappingEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class SinglePortMappingEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleQueuedUnitEditHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleQueuedUnitEditHelper.java
new file mode 100644
index 0000000..5a9c885
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/helpers/SingleQueuedUnitEditHelper.java
@@ -0,0 +1,10 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.helpers;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitEditHelper extends ComrelBaseEditHelper {

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit2EditPart.java
new file mode 100644
index 0000000..a1d6e9c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit2EditPart.java
@@ -0,0 +1,334 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.AtomicUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.AtomicUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3034;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new AtomicUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new AtomicUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new AtomicUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitFigure getPrimaryShape() {

+		return (AtomicUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType2EditPart) {

+			((AtomicUnitLabelType2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureAtomicUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(AtomicUnitLabelType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class AtomicUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureAtomicUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public AtomicUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureAtomicUnitLabelFigure = new WrappingLabel();

+			fFigureAtomicUnitLabelFigure.setText("AtomicUnit");

+

+			this.add(fFigureAtomicUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureAtomicUnitLabelFigure() {

+			return fFigureAtomicUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit3EditPart.java
new file mode 100644
index 0000000..6a05b37
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit3EditPart.java
@@ -0,0 +1,334 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.AtomicUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.AtomicUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3049;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new AtomicUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new AtomicUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new AtomicUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitFigure getPrimaryShape() {

+		return (AtomicUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType3EditPart) {

+			((AtomicUnitLabelType3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureAtomicUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(AtomicUnitLabelType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class AtomicUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureAtomicUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public AtomicUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureAtomicUnitLabelFigure = new WrappingLabel();

+			fFigureAtomicUnitLabelFigure.setText("AtomicUnit");

+

+			this.add(fFigureAtomicUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureAtomicUnitLabelFigure() {

+			return fFigureAtomicUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit4EditPart.java
new file mode 100644
index 0000000..e000c37
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit4EditPart.java
@@ -0,0 +1,334 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.AtomicUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.AtomicUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3068;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new AtomicUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new AtomicUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new AtomicUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitFigure getPrimaryShape() {

+		return (AtomicUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType4EditPart) {

+			((AtomicUnitLabelType4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureAtomicUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(AtomicUnitLabelType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class AtomicUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureAtomicUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public AtomicUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureAtomicUnitLabelFigure = new WrappingLabel();

+			fFigureAtomicUnitLabelFigure.setText("AtomicUnit");

+

+			this.add(fFigureAtomicUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureAtomicUnitLabelFigure() {

+			return fFigureAtomicUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit5EditPart.java
new file mode 100644
index 0000000..6c285a1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit5EditPart.java
@@ -0,0 +1,334 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.AtomicUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.AtomicUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3074;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new AtomicUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new AtomicUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new AtomicUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitFigure getPrimaryShape() {

+		return (AtomicUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType5EditPart) {

+			((AtomicUnitLabelType5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureAtomicUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(AtomicUnitLabelType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class AtomicUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureAtomicUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public AtomicUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureAtomicUnitLabelFigure = new WrappingLabel();

+			fFigureAtomicUnitLabelFigure.setText("AtomicUnit");

+

+			this.add(fFigureAtomicUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureAtomicUnitLabelFigure() {

+			return fFigureAtomicUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit6EditPart.java
new file mode 100644
index 0000000..50914fb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit6EditPart.java
@@ -0,0 +1,334 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.AtomicUnit6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.AtomicUnit6ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit6EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3077;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new AtomicUnit6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new AtomicUnit6CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new AtomicUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitFigure getPrimaryShape() {

+		return (AtomicUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType6EditPart) {

+			((AtomicUnitLabelType6EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureAtomicUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType6EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(AtomicUnitLabelType6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class AtomicUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureAtomicUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public AtomicUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureAtomicUnitLabelFigure = new WrappingLabel();

+			fFigureAtomicUnitLabelFigure.setText("AtomicUnit");

+

+			this.add(fFigureAtomicUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureAtomicUnitLabelFigure() {

+			return fFigureAtomicUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit7EditPart.java
new file mode 100644
index 0000000..cf60afc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnit7EditPart.java
@@ -0,0 +1,338 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.policies.AtomicUnit7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.AtomicUnit7ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit7EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3078;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new AtomicUnit7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new AtomicUnit7CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		AtomicUnitFigure figure = new AtomicUnitFigure();

+		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitFigure getPrimaryShape() {

+		return (AtomicUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType7EditPart) {

+			((AtomicUnitLabelType7EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureAtomicUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelType7EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(AtomicUnitLabelType7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class AtomicUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureAtomicUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public AtomicUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureAtomicUnitLabelFigure = new WrappingLabel();

+			fFigureAtomicUnitLabelFigure.setText("AtomicUnit");

+

+			this.add(fFigureAtomicUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureAtomicUnitLabelFigure() {

+			return fFigureAtomicUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitEditPart.java
new file mode 100644
index 0000000..7b5d7cf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitEditPart.java
@@ -0,0 +1,349 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EcorePackage;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.AtomicUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.AtomicUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2007;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new AtomicUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new AtomicUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new AtomicUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitFigure getPrimaryShape() {

+		return (AtomicUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelTypeEditPart) {

+			((AtomicUnitLabelTypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureAtomicUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof AtomicUnitLabelTypeEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort9EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(AtomicUnitLabelTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		if (event.getNotifier() == getModel()

+				&& EcorePackage.eINSTANCE.getEModelElement_EAnnotations()

+						.equals(event.getFeature())) {

+			handleMajorSemanticChange();

+		} else {

+			super.handleNotificationEvent(event);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public class AtomicUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureAtomicUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public AtomicUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureAtomicUnitLabelFigure = new WrappingLabel();

+			fFigureAtomicUnitLabelFigure.setText("AtomicUnit");

+

+			this.add(fFigureAtomicUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureAtomicUnitLabelFigure() {

+			return fFigureAtomicUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType2EditPart.java
new file mode 100644
index 0000000..03798ad
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class AtomicUnitLabelType2EditPart extends CompartmentEditPart implements

+		ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5027;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitLabelType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.AtomicUnit_3034,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.AtomicUnitLabelType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType3EditPart.java
new file mode 100644
index 0000000..7e81a1f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class AtomicUnitLabelType3EditPart extends CompartmentEditPart implements

+		ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5034;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitLabelType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.AtomicUnit_3049,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.AtomicUnitLabelType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType4EditPart.java
new file mode 100644
index 0000000..009f131
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class AtomicUnitLabelType4EditPart extends CompartmentEditPart implements

+		ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5048;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitLabelType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.AtomicUnit_3068,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.AtomicUnitLabelType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType5EditPart.java
new file mode 100644
index 0000000..2e319e4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class AtomicUnitLabelType5EditPart extends CompartmentEditPart implements

+		ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5050;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitLabelType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.AtomicUnit_3074,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.AtomicUnitLabelType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType6EditPart.java
new file mode 100644
index 0000000..20ca5af
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType6EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class AtomicUnitLabelType6EditPart extends CompartmentEditPart implements

+		ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5053;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitLabelType6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.AtomicUnit_3077,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.AtomicUnitLabelType6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType7EditPart.java
new file mode 100644
index 0000000..783f109
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelType7EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class AtomicUnitLabelType7EditPart extends CompartmentEditPart implements

+		ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5054;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitLabelType7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.AtomicUnit_3078,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.AtomicUnitLabelType7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelTypeEditPart.java
new file mode 100644
index 0000000..eb0b51a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/AtomicUnitLabelTypeEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class AtomicUnitLabelTypeEditPart extends CompartmentEditPart implements

+		ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5085;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitLabelTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.AtomicUnit_2007,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.AtomicUnitLabelTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit2EditPart.java
new file mode 100644
index 0000000..649b2d9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit2EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.CartesianQueuedUnitEditPart.CartesianQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.CartesianQueuedUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnit2ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3003;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		CartesianQueuedUnitFigure figure = new CartesianQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitFigure getPrimaryShape() {

+		return (CartesianQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict2EditPart) {

+			((CartesianQueuedUnitNameTypeLblStrict2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureCartesianQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class CartesianQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureCartesianQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public CartesianQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureCartesianQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureCartesianQueuedUnitLabelFigure

+					.setText("CartesianQueuedUnit");

+			fFigureCartesianQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureCartesianQueuedUnitLabelFigure);

+

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fCartesianQueuedUnitHelperUnitsCompartmentFigure);

+

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure

+					.setOutline(false);

+

+			this.add(fCartesianQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureCartesianQueuedUnitLabelFigure() {

+			return fFigureCartesianQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitHelperUnitsCompartmentFigure() {

+			return fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit3EditPart.java
new file mode 100644
index 0000000..9a10d2f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit3EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.CartesianQueuedUnitEditPart.CartesianQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.CartesianQueuedUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnit3ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3007;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		CartesianQueuedUnitFigure figure = new CartesianQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitFigure getPrimaryShape() {

+		return (CartesianQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict3EditPart) {

+			((CartesianQueuedUnitNameTypeLblStrict3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureCartesianQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class CartesianQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureCartesianQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public CartesianQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureCartesianQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureCartesianQueuedUnitLabelFigure

+					.setText("CartesianQueuedUnit");

+			fFigureCartesianQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureCartesianQueuedUnitLabelFigure);

+

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fCartesianQueuedUnitHelperUnitsCompartmentFigure);

+

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure

+					.setOutline(false);

+

+			this.add(fCartesianQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureCartesianQueuedUnitLabelFigure() {

+			return fFigureCartesianQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitHelperUnitsCompartmentFigure() {

+			return fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit4EditPart.java
new file mode 100644
index 0000000..a642d95
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit4EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.CartesianQueuedUnitEditPart.CartesianQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.CartesianQueuedUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnit4ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3025;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		CartesianQueuedUnitFigure figure = new CartesianQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitFigure getPrimaryShape() {

+		return (CartesianQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict4EditPart) {

+			((CartesianQueuedUnitNameTypeLblStrict4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureCartesianQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class CartesianQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureCartesianQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public CartesianQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureCartesianQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureCartesianQueuedUnitLabelFigure

+					.setText("CartesianQueuedUnit");

+			fFigureCartesianQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureCartesianQueuedUnitLabelFigure);

+

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fCartesianQueuedUnitHelperUnitsCompartmentFigure);

+

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure

+					.setOutline(false);

+

+			this.add(fCartesianQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureCartesianQueuedUnitLabelFigure() {

+			return fFigureCartesianQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitHelperUnitsCompartmentFigure() {

+			return fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit5EditPart.java
new file mode 100644
index 0000000..4fd669a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit5EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.CartesianQueuedUnitEditPart.CartesianQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.CartesianQueuedUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnit5ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3029;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		CartesianQueuedUnitFigure figure = new CartesianQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitFigure getPrimaryShape() {

+		return (CartesianQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict5EditPart) {

+			((CartesianQueuedUnitNameTypeLblStrict5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureCartesianQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class CartesianQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureCartesianQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public CartesianQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureCartesianQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureCartesianQueuedUnitLabelFigure

+					.setText("CartesianQueuedUnit");

+			fFigureCartesianQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureCartesianQueuedUnitLabelFigure);

+

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fCartesianQueuedUnitHelperUnitsCompartmentFigure);

+

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure

+					.setOutline(false);

+

+			this.add(fCartesianQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureCartesianQueuedUnitLabelFigure() {

+			return fFigureCartesianQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitHelperUnitsCompartmentFigure() {

+			return fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit6EditPart.java
new file mode 100644
index 0000000..ea7c698
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit6EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.CartesianQueuedUnitEditPart.CartesianQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.CartesianQueuedUnit6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnit6ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit6EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3033;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnit6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnit6CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		CartesianQueuedUnitFigure figure = new CartesianQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitFigure getPrimaryShape() {

+		return (CartesianQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict6EditPart) {

+			((CartesianQueuedUnitNameTypeLblStrict6EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureCartesianQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict6EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class CartesianQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureCartesianQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public CartesianQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureCartesianQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureCartesianQueuedUnitLabelFigure

+					.setText("CartesianQueuedUnit");

+			fFigureCartesianQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureCartesianQueuedUnitLabelFigure);

+

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fCartesianQueuedUnitHelperUnitsCompartmentFigure);

+

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure

+					.setOutline(false);

+

+			this.add(fCartesianQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureCartesianQueuedUnitLabelFigure() {

+			return fFigureCartesianQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitHelperUnitsCompartmentFigure() {

+			return fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit7EditPart.java
new file mode 100644
index 0000000..7d42770
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnit7EditPart.java
@@ -0,0 +1,439 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.CartesianQueuedUnit7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnit7ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit7EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3047;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnit7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnit7CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		CartesianQueuedUnitFigure figure = new CartesianQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitFigure getPrimaryShape() {

+		return (CartesianQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict7EditPart) {

+			((CartesianQueuedUnitNameTypeLblStrict7EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureCartesianQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrict7EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class CartesianQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureCartesianQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public CartesianQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureCartesianQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureCartesianQueuedUnitLabelFigure

+					.setText("CartesianQueuedUnit");

+			fFigureCartesianQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureCartesianQueuedUnitLabelFigure);

+

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fCartesianQueuedUnitHelperUnitsCompartmentFigure);

+

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure

+					.setOutline(false);

+

+			this.add(fCartesianQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureCartesianQueuedUnitLabelFigure() {

+			return fFigureCartesianQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitHelperUnitsCompartmentFigure() {

+			return fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.java
new file mode 100644
index 0000000..6235dbe
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7003;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.java
new file mode 100644
index 0000000..f9fe04c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7007;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.java
new file mode 100644
index 0000000..839c0ca
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7011;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.java
new file mode 100644
index 0000000..4815300
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7015;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.java
new file mode 100644
index 0000000..ae7a1d2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7021;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.java
new file mode 100644
index 0000000..c1ef01e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7039;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.java
new file mode 100644
index 0000000..be70376
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7001;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.java
new file mode 100644
index 0000000..a031a13
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7004;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.java
new file mode 100644
index 0000000..bec06d6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7008;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.java
new file mode 100644
index 0000000..6c6c448
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7012;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.java
new file mode 100644
index 0000000..231f34b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7016;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.java
new file mode 100644
index 0000000..3ee01a6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7022;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.java
new file mode 100644
index 0000000..b0775be
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7040;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.java
new file mode 100644
index 0000000..1a7b069
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7002;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitEditPart.java
new file mode 100644
index 0000000..07edb9e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitEditPart.java
@@ -0,0 +1,451 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EcorePackage;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.CartesianQueuedUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.CartesianQueuedUnitItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2002;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CartesianQueuedUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CartesianQueuedUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		CartesianQueuedUnitFigure figure = new CartesianQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitFigure getPrimaryShape() {

+		return (CartesianQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrictEditPart) {

+			((CartesianQueuedUnitNameTypeLblStrictEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureCartesianQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof CartesianQueuedUnitNameTypeLblStrictEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort2EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart) {

+			return getPrimaryShape()

+					.getCartesianQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		if (event.getNotifier() == getModel()

+				&& EcorePackage.eINSTANCE.getEModelElement_EAnnotations()

+						.equals(event.getFeature())) {

+			handleMajorSemanticChange();

+		} else {

+			super.handleNotificationEvent(event);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public class CartesianQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureCartesianQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public CartesianQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureCartesianQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureCartesianQueuedUnitLabelFigure

+					.setText("CartesianQueuedUnit");

+			fFigureCartesianQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureCartesianQueuedUnitLabelFigure);

+

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fCartesianQueuedUnitHelperUnitsCompartmentFigure);

+

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fCartesianQueuedUnitRefactoringUnitCompartmentFigure

+					.setOutline(false);

+

+			this.add(fCartesianQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureCartesianQueuedUnitLabelFigure() {

+			return fFigureCartesianQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitHelperUnitsCompartmentFigure() {

+			return fCartesianQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getCartesianQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fCartesianQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict2EditPart.java
new file mode 100644
index 0000000..7fab219
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitNameTypeLblStrict2EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5079;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitNameTypeLblStrict2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.CartesianQueuedUnit_3003,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict3EditPart.java
new file mode 100644
index 0000000..f0c9584
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitNameTypeLblStrict3EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5077;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitNameTypeLblStrict3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.CartesianQueuedUnit_3007,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict4EditPart.java
new file mode 100644
index 0000000..4dfeac7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitNameTypeLblStrict4EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5075;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitNameTypeLblStrict4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.CartesianQueuedUnit_3025,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict5EditPart.java
new file mode 100644
index 0000000..ea0d1a3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitNameTypeLblStrict5EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5073;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitNameTypeLblStrict5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.CartesianQueuedUnit_3029,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict6EditPart.java
new file mode 100644
index 0000000..ae24b7a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict6EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitNameTypeLblStrict6EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5028;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitNameTypeLblStrict6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.CartesianQueuedUnit_3033,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict7EditPart.java
new file mode 100644
index 0000000..b393e23
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrict7EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitNameTypeLblStrict7EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5033;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitNameTypeLblStrict7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.CartesianQueuedUnit_3047,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrictEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrictEditPart.java
new file mode 100644
index 0000000..b2a1561
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CartesianQueuedUnitNameTypeLblStrictEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitNameTypeLblStrictEditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5080;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitNameTypeLblStrictEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.CartesianQueuedUnit_2002,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CompositeRefactoringEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CompositeRefactoringEditPart.java
new file mode 100644
index 0000000..e710fe4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/CompositeRefactoringEditPart.java
@@ -0,0 +1,134 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+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.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+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.editpolicies.DiagramDragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.ComrelCreateShortcutDecorationsCommand;

+import comrel.diagram.edit.policies.CompositeRefactoringCanonicalEditPolicy;

+import comrel.diagram.edit.policies.CompositeRefactoringItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class CompositeRefactoringEditPart extends DiagramEditPart {

+

+	/**

+	 * @generated

+	 */

+	public final static String MODEL_ID = "Comrel"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 1000;

+

+	/**

+	 * @generated

+	 */

+	public CompositeRefactoringEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new CompositeRefactoringItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new CompositeRefactoringCanonicalEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DiagramDragDropEditPolicy() {

+					public Command getDropObjectsCommand(

+							DropObjectsRequest dropRequest) {

+						ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>();

+						for (Iterator<?> it = dropRequest.getObjects()

+								.iterator(); it.hasNext();) {

+							Object nextObject = it.next();

+							if (false == nextObject instanceof EObject) {

+								continue;

+							}

+							viewDescriptors

+									.add(new CreateViewRequest.ViewDescriptor(

+											new EObjectAdapter(

+													(EObject) nextObject),

+											Node.class, null,

+											getDiagramPreferencesHint()));

+						}

+						return createShortcutsCommand(dropRequest,

+								viewDescriptors);

+					}

+

+					private Command createShortcutsCommand(

+							DropObjectsRequest dropRequest,

+							List<CreateViewRequest.ViewDescriptor> viewDescriptors) {

+						Command command = createViewsAndArrangeCommand(

+								dropRequest, viewDescriptors);

+						if (command != null) {

+							return command

+									.chain(new ICommandProxy(

+											new ComrelCreateShortcutDecorationsCommand(

+													getEditingDomain(),

+													(View) getModel(),

+													viewDescriptors)));

+						}

+						return null;

+					}

+				});

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	/*package-local*/static class NodeLabelDragPolicy extends

+			NonResizableEditPolicy {

+

+		/**

+		 * @generated

+		 */

+		@SuppressWarnings("rawtypes")

+		protected List createSelectionHandles() {

+			MoveHandle h = new MoveHandle((GraphicalEditPart) getHost());

+			h.setBorder(null);

+			return Collections.singletonList(h);

+		}

+

+		/**

+		 * @generated

+		 */

+		public Command getCommand(Request request) {

+			return null;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean understandsRequest(Request request) {

+			return false;

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ComrelEditPartFactory.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ComrelEditPartFactory.java
new file mode 100644
index 0000000..c0a5bf3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ComrelEditPartFactory.java
@@ -0,0 +1,1009 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.FigureUtilities;

+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.WrappingLabel;

+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 comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelEditPartFactory implements EditPartFactory {

+

+	/**

+	 * @generated

+	 */

+	public EditPart createEditPart(EditPart context, Object model) {

+		if (model instanceof View) {

+			View view = (View) model;

+			switch (ComrelVisualIDRegistry.getVisualID(view)) {

+

+			case CompositeRefactoringEditPart.VISUAL_ID:

+				return new CompositeRefactoringEditPart(view);

+

+			case SingleInputPortEditPart.VISUAL_ID:

+				return new SingleInputPortEditPart(view);

+

+			case SingleInputPortNameTypeEditPart.VISUAL_ID:

+				return new SingleInputPortNameTypeEditPart(view);

+

+			case CartesianQueuedUnitEditPart.VISUAL_ID:

+				return new CartesianQueuedUnitEditPart(view);

+

+			case CartesianQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID:

+				return new CartesianQueuedUnitNameTypeLblStrictEditPart(view);

+

+			case ParallelQueuedUnitEditPart.VISUAL_ID:

+				return new ParallelQueuedUnitEditPart(view);

+

+			case ParallelQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID:

+				return new ParallelQueuedUnitNameTypeLblStrictEditPart(view);

+

+			case SingleQueuedUnitEditPart.VISUAL_ID:

+				return new SingleQueuedUnitEditPart(view);

+

+			case SingleQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID:

+				return new SingleQueuedUnitNameTypeLblStrictEditPart(view);

+

+			case SequentialUnitEditPart.VISUAL_ID:

+				return new SequentialUnitEditPart(view);

+

+			case SequentialUnitNameTypeLblStrictEditPart.VISUAL_ID:

+				return new SequentialUnitNameTypeLblStrictEditPart(view);

+

+			case ConditionalUnitEditPart.VISUAL_ID:

+				return new ConditionalUnitEditPart(view);

+

+			case ConditionalUnitNameTypeEditPart.VISUAL_ID:

+				return new ConditionalUnitNameTypeEditPart(view);

+

+			case AtomicUnitEditPart.VISUAL_ID:

+				return new AtomicUnitEditPart(view);

+

+			case AtomicUnitLabelTypeEditPart.VISUAL_ID:

+				return new AtomicUnitLabelTypeEditPart(view);

+

+			case SingleInputPort2EditPart.VISUAL_ID:

+				return new SingleInputPort2EditPart(view);

+

+			case SingleInputPortNameType2EditPart.VISUAL_ID:

+				return new SingleInputPortNameType2EditPart(view);

+

+			case MultiInputPortEditPart.VISUAL_ID:

+				return new MultiInputPortEditPart(view);

+

+			case MultiInputPortNameTypeEditPart.VISUAL_ID:

+				return new MultiInputPortNameTypeEditPart(view);

+

+			case CartesianQueuedUnit2EditPart.VISUAL_ID:

+				return new CartesianQueuedUnit2EditPart(view);

+

+			case CartesianQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitNameTypeLblStrict2EditPart(view);

+

+			case ParallelQueuedUnit2EditPart.VISUAL_ID:

+				return new ParallelQueuedUnit2EditPart(view);

+

+			case ParallelQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitNameTypeLblStrict2EditPart(view);

+

+			case SingleInputPort3EditPart.VISUAL_ID:

+				return new SingleInputPort3EditPart(view);

+

+			case SingleInputPortNameType3EditPart.VISUAL_ID:

+				return new SingleInputPortNameType3EditPart(view);

+

+			case MultiInputPort2EditPart.VISUAL_ID:

+				return new MultiInputPort2EditPart(view);

+

+			case MultiInputPortNameType2EditPart.VISUAL_ID:

+				return new MultiInputPortNameType2EditPart(view);

+

+			case CartesianQueuedUnit3EditPart.VISUAL_ID:

+				return new CartesianQueuedUnit3EditPart(view);

+

+			case CartesianQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitNameTypeLblStrict3EditPart(view);

+

+			case SingleFeatureUnitEditPart.VISUAL_ID:

+				return new SingleFeatureUnitEditPart(view);

+

+			case SingleFeatureUnitNameTypeEditPart.VISUAL_ID:

+				return new SingleFeatureUnitNameTypeEditPart(view);

+

+			case SingleInputPort4EditPart.VISUAL_ID:

+				return new SingleInputPort4EditPart(view);

+

+			case SingleInputPortNameType4EditPart.VISUAL_ID:

+				return new SingleInputPortNameType4EditPart(view);

+

+			case MultiInputPort3EditPart.VISUAL_ID:

+				return new MultiInputPort3EditPart(view);

+

+			case MultiInputPortNameType3EditPart.VISUAL_ID:

+				return new MultiInputPortNameType3EditPart(view);

+

+			case SingleOutputPortEditPart.VISUAL_ID:

+				return new SingleOutputPortEditPart(view);

+

+			case SingleOutputPortNameTypeEditPart.VISUAL_ID:

+				return new SingleOutputPortNameTypeEditPart(view);

+

+			case MultiFeatureUnitEditPart.VISUAL_ID:

+				return new MultiFeatureUnitEditPart(view);

+

+			case MultiFeatureUnitNameTypeEditPart.VISUAL_ID:

+				return new MultiFeatureUnitNameTypeEditPart(view);

+

+			case SingleInputPort5EditPart.VISUAL_ID:

+				return new SingleInputPort5EditPart(view);

+

+			case SingleInputPortNameType5EditPart.VISUAL_ID:

+				return new SingleInputPortNameType5EditPart(view);

+

+			case MultiInputPort4EditPart.VISUAL_ID:

+				return new MultiInputPort4EditPart(view);

+

+			case MultiInputPortNameType4EditPart.VISUAL_ID:

+				return new MultiInputPortNameType4EditPart(view);

+

+			case MultiOutputPortEditPart.VISUAL_ID:

+				return new MultiOutputPortEditPart(view);

+

+			case MultiOutputPortNameTypeEditPart.VISUAL_ID:

+				return new MultiOutputPortNameTypeEditPart(view);

+

+			case SingleFilterUnitEditPart.VISUAL_ID:

+				return new SingleFilterUnitEditPart(view);

+

+			case SingleFilterUnitNameTypeEditPart.VISUAL_ID:

+				return new SingleFilterUnitNameTypeEditPart(view);

+

+			case MultiInputPort5EditPart.VISUAL_ID:

+				return new MultiInputPort5EditPart(view);

+

+			case MultiInputPortNameType5EditPart.VISUAL_ID:

+				return new MultiInputPortNameType5EditPart(view);

+

+			case SingleOutputPort2EditPart.VISUAL_ID:

+				return new SingleOutputPort2EditPart(view);

+

+			case SingleOutputPortNameType2EditPart.VISUAL_ID:

+				return new SingleOutputPortNameType2EditPart(view);

+

+			case MultiFilterUnitEditPart.VISUAL_ID:

+				return new MultiFilterUnitEditPart(view);

+

+			case MultiFilterUnitNameTypeEditPart.VISUAL_ID:

+				return new MultiFilterUnitNameTypeEditPart(view);

+

+			case MultiInputPort6EditPart.VISUAL_ID:

+				return new MultiInputPort6EditPart(view);

+

+			case MultiInputPortNameType6EditPart.VISUAL_ID:

+				return new MultiInputPortNameType6EditPart(view);

+

+			case MultiOutputPort2EditPart.VISUAL_ID:

+				return new MultiOutputPort2EditPart(view);

+

+			case MultiOutputPortNameType2EditPart.VISUAL_ID:

+				return new MultiOutputPortNameType2EditPart(view);

+

+			case SingleQueuedUnit2EditPart.VISUAL_ID:

+				return new SingleQueuedUnit2EditPart(view);

+

+			case SingleQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+				return new SingleQueuedUnitNameTypeLblStrict2EditPart(view);

+

+			case SingleInputPort6EditPart.VISUAL_ID:

+				return new SingleInputPort6EditPart(view);

+

+			case SingleInputPortNameType6EditPart.VISUAL_ID:

+				return new SingleInputPortNameType6EditPart(view);

+

+			case MultiInputPort7EditPart.VISUAL_ID:

+				return new MultiInputPort7EditPart(view);

+

+			case MultiInputPortNameType7EditPart.VISUAL_ID:

+				return new MultiInputPortNameType7EditPart(view);

+

+			case CartesianQueuedUnit4EditPart.VISUAL_ID:

+				return new CartesianQueuedUnit4EditPart(view);

+

+			case CartesianQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitNameTypeLblStrict4EditPart(view);

+

+			case SequentialUnit2EditPart.VISUAL_ID:

+				return new SequentialUnit2EditPart(view);

+

+			case SequentialUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+				return new SequentialUnitNameTypeLblStrict2EditPart(view);

+

+			case SingleInputPort7EditPart.VISUAL_ID:

+				return new SingleInputPort7EditPart(view);

+

+			case SingleInputPortNameType7EditPart.VISUAL_ID:

+				return new SingleInputPortNameType7EditPart(view);

+

+			case MultiInputPort8EditPart.VISUAL_ID:

+				return new MultiInputPort8EditPart(view);

+

+			case MultiInputPortNameType8EditPart.VISUAL_ID:

+				return new MultiInputPortNameType8EditPart(view);

+

+			case CartesianQueuedUnit5EditPart.VISUAL_ID:

+				return new CartesianQueuedUnit5EditPart(view);

+

+			case CartesianQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitNameTypeLblStrict5EditPart(view);

+

+			case ConditionalUnit2EditPart.VISUAL_ID:

+				return new ConditionalUnit2EditPart(view);

+

+			case ConditionalUnitNameType2EditPart.VISUAL_ID:

+				return new ConditionalUnitNameType2EditPart(view);

+

+			case SingleInputPort8EditPart.VISUAL_ID:

+				return new SingleInputPort8EditPart(view);

+

+			case SingleInputPortNameType8EditPart.VISUAL_ID:

+				return new SingleInputPortNameType8EditPart(view);

+

+			case MultiInputPort9EditPart.VISUAL_ID:

+				return new MultiInputPort9EditPart(view);

+

+			case MultiInputPortNameType9EditPart.VISUAL_ID:

+				return new MultiInputPortNameType9EditPart(view);

+

+			case CartesianQueuedUnit6EditPart.VISUAL_ID:

+				return new CartesianQueuedUnit6EditPart(view);

+

+			case CartesianQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitNameTypeLblStrict6EditPart(view);

+

+			case AtomicUnit2EditPart.VISUAL_ID:

+				return new AtomicUnit2EditPart(view);

+

+			case AtomicUnitLabelType2EditPart.VISUAL_ID:

+				return new AtomicUnitLabelType2EditPart(view);

+

+			case SingleInputPort9EditPart.VISUAL_ID:

+				return new SingleInputPort9EditPart(view);

+

+			case SingleInputPortNameType9EditPart.VISUAL_ID:

+				return new SingleInputPortNameType9EditPart(view);

+

+			case ParallelQueuedUnit3EditPart.VISUAL_ID:

+				return new ParallelQueuedUnit3EditPart(view);

+

+			case ParallelQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitNameTypeLblStrict3EditPart(view);

+

+			case ParallelQueuedUnit4EditPart.VISUAL_ID:

+				return new ParallelQueuedUnit4EditPart(view);

+

+			case ParallelQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitNameTypeLblStrict4EditPart(view);

+

+			case SingleFeatureUnit2EditPart.VISUAL_ID:

+				return new SingleFeatureUnit2EditPart(view);

+

+			case SingleFeatureUnitNameType2EditPart.VISUAL_ID:

+				return new SingleFeatureUnitNameType2EditPart(view);

+

+			case MultiFeatureUnit2EditPart.VISUAL_ID:

+				return new MultiFeatureUnit2EditPart(view);

+

+			case MultiFeatureUnitNameType2EditPart.VISUAL_ID:

+				return new MultiFeatureUnitNameType2EditPart(view);

+

+			case SingleFilterUnit2EditPart.VISUAL_ID:

+				return new SingleFilterUnit2EditPart(view);

+

+			case SingleFilterUnitNameType2EditPart.VISUAL_ID:

+				return new SingleFilterUnitNameType2EditPart(view);

+

+			case MultiFilterUnit2EditPart.VISUAL_ID:

+				return new MultiFilterUnit2EditPart(view);

+

+			case MultiFilterUnitNameType2EditPart.VISUAL_ID:

+				return new MultiFilterUnitNameType2EditPart(view);

+

+			case SingleQueuedUnit3EditPart.VISUAL_ID:

+				return new SingleQueuedUnit3EditPart(view);

+

+			case SingleQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+				return new SingleQueuedUnitNameTypeLblStrict3EditPart(view);

+

+			case ParallelQueuedUnit5EditPart.VISUAL_ID:

+				return new ParallelQueuedUnit5EditPart(view);

+

+			case ParallelQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitNameTypeLblStrict5EditPart(view);

+

+			case SequentialUnit3EditPart.VISUAL_ID:

+				return new SequentialUnit3EditPart(view);

+

+			case SequentialUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+				return new SequentialUnitNameTypeLblStrict3EditPart(view);

+

+			case ParallelQueuedUnit6EditPart.VISUAL_ID:

+				return new ParallelQueuedUnit6EditPart(view);

+

+			case ParallelQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitNameTypeLblStrict6EditPart(view);

+

+			case ConditionalUnit3EditPart.VISUAL_ID:

+				return new ConditionalUnit3EditPart(view);

+

+			case ConditionalUnitNameType3EditPart.VISUAL_ID:

+				return new ConditionalUnitNameType3EditPart(view);

+

+			case CartesianQueuedUnit7EditPart.VISUAL_ID:

+				return new CartesianQueuedUnit7EditPart(view);

+

+			case CartesianQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitNameTypeLblStrict7EditPart(view);

+

+			case ParallelQueuedUnit7EditPart.VISUAL_ID:

+				return new ParallelQueuedUnit7EditPart(view);

+

+			case ParallelQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitNameTypeLblStrict7EditPart(view);

+

+			case AtomicUnit3EditPart.VISUAL_ID:

+				return new AtomicUnit3EditPart(view);

+

+			case AtomicUnitLabelType3EditPart.VISUAL_ID:

+				return new AtomicUnitLabelType3EditPart(view);

+

+			case SingleFeatureUnit3EditPart.VISUAL_ID:

+				return new SingleFeatureUnit3EditPart(view);

+

+			case SingleFeatureUnitNameType3EditPart.VISUAL_ID:

+				return new SingleFeatureUnitNameType3EditPart(view);

+

+			case MultiFeatureUnit3EditPart.VISUAL_ID:

+				return new MultiFeatureUnit3EditPart(view);

+

+			case MultiFeatureUnitNameType3EditPart.VISUAL_ID:

+				return new MultiFeatureUnitNameType3EditPart(view);

+

+			case SingleFilterUnit3EditPart.VISUAL_ID:

+				return new SingleFilterUnit3EditPart(view);

+

+			case SingleFilterUnitNameType3EditPart.VISUAL_ID:

+				return new SingleFilterUnitNameType3EditPart(view);

+

+			case MultiFilterUnit3EditPart.VISUAL_ID:

+				return new MultiFilterUnit3EditPart(view);

+

+			case MultiFilterUnitNameType3EditPart.VISUAL_ID:

+				return new MultiFilterUnitNameType3EditPart(view);

+

+			case SingleQueuedUnit4EditPart.VISUAL_ID:

+				return new SingleQueuedUnit4EditPart(view);

+

+			case SingleQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+				return new SingleQueuedUnitNameTypeLblStrict4EditPart(view);

+

+			case SingleFeatureUnit4EditPart.VISUAL_ID:

+				return new SingleFeatureUnit4EditPart(view);

+

+			case SingleFeatureUnitNameType4EditPart.VISUAL_ID:

+				return new SingleFeatureUnitNameType4EditPart(view);

+

+			case MultiFeatureUnit4EditPart.VISUAL_ID:

+				return new MultiFeatureUnit4EditPart(view);

+

+			case MultiFeatureUnitNameType4EditPart.VISUAL_ID:

+				return new MultiFeatureUnitNameType4EditPart(view);

+

+			case SingleFilterUnit4EditPart.VISUAL_ID:

+				return new SingleFilterUnit4EditPart(view);

+

+			case SingleFilterUnitNameType4EditPart.VISUAL_ID:

+				return new SingleFilterUnitNameType4EditPart(view);

+

+			case MultiFilterUnit4EditPart.VISUAL_ID:

+				return new MultiFilterUnit4EditPart(view);

+

+			case MultiFilterUnitNameType4EditPart.VISUAL_ID:

+				return new MultiFilterUnitNameType4EditPart(view);

+

+			case SingleQueuedUnit5EditPart.VISUAL_ID:

+				return new SingleQueuedUnit5EditPart(view);

+

+			case SingleQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+				return new SingleQueuedUnitNameTypeLblStrict5EditPart(view);

+

+			case SequentialUnit4EditPart.VISUAL_ID:

+				return new SequentialUnit4EditPart(view);

+

+			case SequentialUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+				return new SequentialUnitNameTypeLblStrict4EditPart(view);

+

+			case SingleFeatureUnit5EditPart.VISUAL_ID:

+				return new SingleFeatureUnit5EditPart(view);

+

+			case SingleFeatureUnitNameType5EditPart.VISUAL_ID:

+				return new SingleFeatureUnitNameType5EditPart(view);

+

+			case MultiFeatureUnit5EditPart.VISUAL_ID:

+				return new MultiFeatureUnit5EditPart(view);

+

+			case MultiFeatureUnitNameType5EditPart.VISUAL_ID:

+				return new MultiFeatureUnitNameType5EditPart(view);

+

+			case SingleFilterUnit5EditPart.VISUAL_ID:

+				return new SingleFilterUnit5EditPart(view);

+

+			case SingleFilterUnitNameType5EditPart.VISUAL_ID:

+				return new SingleFilterUnitNameType5EditPart(view);

+

+			case MultiFilterUnit5EditPart.VISUAL_ID:

+				return new MultiFilterUnit5EditPart(view);

+

+			case MultiFilterUnitNameType5EditPart.VISUAL_ID:

+				return new MultiFilterUnitNameType5EditPart(view);

+

+			case SingleQueuedUnit6EditPart.VISUAL_ID:

+				return new SingleQueuedUnit6EditPart(view);

+

+			case SingleQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+				return new SingleQueuedUnitNameTypeLblStrict6EditPart(view);

+

+			case ConditionalUnit4EditPart.VISUAL_ID:

+				return new ConditionalUnit4EditPart(view);

+

+			case ConditionalUnitNameType4EditPart.VISUAL_ID:

+				return new ConditionalUnitNameType4EditPart(view);

+

+			case SingleQueuedUnit7EditPart.VISUAL_ID:

+				return new SingleQueuedUnit7EditPart(view);

+

+			case SingleQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+				return new SingleQueuedUnitNameTypeLblStrict7EditPart(view);

+

+			case AtomicUnit4EditPart.VISUAL_ID:

+				return new AtomicUnit4EditPart(view);

+

+			case AtomicUnitLabelType4EditPart.VISUAL_ID:

+				return new AtomicUnitLabelType4EditPart(view);

+

+			case SequentialUnit5EditPart.VISUAL_ID:

+				return new SequentialUnit5EditPart(view);

+

+			case SequentialUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+				return new SequentialUnitNameTypeLblStrict5EditPart(view);

+

+			case SequentialUnit6EditPart.VISUAL_ID:

+				return new SequentialUnit6EditPart(view);

+

+			case SequentialUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+				return new SequentialUnitNameTypeLblStrict6EditPart(view);

+

+			case ConditionalUnit5EditPart.VISUAL_ID:

+				return new ConditionalUnit5EditPart(view);

+

+			case ConditionalUnitNameType5EditPart.VISUAL_ID:

+				return new ConditionalUnitNameType5EditPart(view);

+

+			case ConditionalUnit6EditPart.VISUAL_ID:

+				return new ConditionalUnit6EditPart(view);

+

+			case ConditionalUnitNameType6EditPart.VISUAL_ID:

+				return new ConditionalUnitNameType6EditPart(view);

+

+			case SequentialUnit7EditPart.VISUAL_ID:

+				return new SequentialUnit7EditPart(view);

+

+			case SequentialUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+				return new SequentialUnitNameTypeLblStrict7EditPart(view);

+

+			case AtomicUnit5EditPart.VISUAL_ID:

+				return new AtomicUnit5EditPart(view);

+

+			case AtomicUnitLabelType5EditPart.VISUAL_ID:

+				return new AtomicUnitLabelType5EditPart(view);

+

+			case ConditionalUnit7EditPart.VISUAL_ID:

+				return new ConditionalUnit7EditPart(view);

+

+			case ConditionalUnitNameType7EditPart.VISUAL_ID:

+				return new ConditionalUnitNameType7EditPart(view);

+

+			case ConditionCheckEditPart.VISUAL_ID:

+				return new ConditionCheckEditPart(view);

+

+			case ConditionCheckNameTypeSpecEditPart.VISUAL_ID:

+				return new ConditionCheckNameTypeSpecEditPart(view);

+

+			case AtomicUnit6EditPart.VISUAL_ID:

+				return new AtomicUnit6EditPart(view);

+

+			case AtomicUnitLabelType6EditPart.VISUAL_ID:

+				return new AtomicUnitLabelType6EditPart(view);

+

+			case AtomicUnit7EditPart.VISUAL_ID:

+				return new AtomicUnit7EditPart(view);

+

+			case AtomicUnitLabelType7EditPart.VISUAL_ID:

+				return new AtomicUnitLabelType7EditPart(view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart(

+						view);

+

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitIfCompartmentEditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitThenCompartmentEditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitElseCompartmentEditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitIfCompartment2EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitThenCompartment2EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitElseCompartment2EditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart(

+						view);

+

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+				return new CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitIfCompartment3EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitThenCompartment3EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitElseCompartment3EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitIfCompartment4EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitThenCompartment4EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitElseCompartment4EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitIfCompartment5EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitThenCompartment5EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitElseCompartment5EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitIfCompartment6EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitThenCompartment6EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitElseCompartment6EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart(

+						view);

+

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+				return new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart(

+						view);

+

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+				return new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart(

+						view);

+

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+				return new SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitIfCompartment7EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitThenCompartment7EditPart(

+						view);

+

+			case ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID:

+				return new ConditionalUnitConditionalUnitElseCompartment7EditPart(

+						view);

+

+			case SinglePortMappingEditPart.VISUAL_ID:

+				return new SinglePortMappingEditPart(view);

+

+			case MultiPortMappingEditPart.VISUAL_ID:

+				return new MultiPortMappingEditPart(view);

+

+			case MultiSinglePortMappingEditPart.VISUAL_ID:

+				return new MultiSinglePortMappingEditPart(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 WrappingLabel)

+			return new TextCellEditorLocator((WrappingLabel) source.getFigure());

+		else {

+			return new LabelCellEditorLocator((Label) source.getFigure());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	static private class TextCellEditorLocator implements CellEditorLocator {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel wrapLabel;

+

+		/**

+		 * @generated

+		 */

+		public TextCellEditorLocator(WrappingLabel wrapLabel) {

+			this.wrapLabel = wrapLabel;

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getWrapLabel() {

+			return wrapLabel;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void relocate(CellEditor celleditor) {

+			Text text = (Text) celleditor.getControl();

+			Rectangle rect = getWrapLabel().getTextBounds().getCopy();

+			getWrapLabel().translateToAbsolute(rect);

+			if (!text.getFont().isDisposed()) {

+				if (getWrapLabel().isTextWrapOn()

+						&& 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);

+			if (!text.getFont().isDisposed()) {

+				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/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionCheckEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionCheckEditPart.java
new file mode 100644
index 0000000..a84eee9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionCheckEditPart.java
@@ -0,0 +1,298 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.IGraphicalEditPart;

+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.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionCheckItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionCheckEditPart extends ShapeNodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3076;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionCheckEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionCheckItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.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() {

+		return primaryShape = new ConditionCheckFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionCheckFigure getPrimaryShape() {

+		return (ConditionCheckFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionCheckNameTypeSpecEditPart) {

+			((ConditionCheckNameTypeSpecEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionCheckLabelFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionCheckNameTypeSpecEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionCheckNameTypeSpecEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionCheckFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionCheckLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionCheckFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionCheckLabelFigure = new WrappingLabel();

+			fFigureConditionCheckLabelFigure.setText("ConditionCheck");

+

+			this.add(fFigureConditionCheckLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionCheckLabelFigure() {

+			return fFigureConditionCheckLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionCheckNameTypeSpecEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionCheckNameTypeSpecEditPart.java
new file mode 100644
index 0000000..361e2a2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionCheckNameTypeSpecEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionCheckNameTypeSpecEditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5052;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionCheckNameTypeSpecEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionCheck_3076,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionCheckNameTypeSpecEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit2EditPart.java
new file mode 100644
index 0000000..a2b8187
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit2EditPart.java
@@ -0,0 +1,493 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionalUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnit2ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3030;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new ConditionalUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitFigure getPrimaryShape() {

+		return (ConditionalUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType2EditPart) {

+			((ConditionalUnitNameType2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionalUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitIfCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitThenCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitElseCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitIfCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitThenCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitElseCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartmentEditPart) {

+			return getPrimaryShape().getConditionalUnitIfCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart) {

+			return getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartmentEditPart) {

+			return getPrimaryShape().getConditionalUnitThenCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartmentEditPart) {

+			return getPrimaryShape().getConditionalUnitElseCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionalUnitNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionalUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionalUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitIfCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitThenCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitElseCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionalUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionalUnitLabelFigure = new WrappingLabel();

+			fFigureConditionalUnitLabelFigure.setText("ConditionalUnit");

+			fFigureConditionalUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureConditionalUnitLabelFigure);

+

+			fConditionalUnitIfCompartmentFigure = new RectangleFigure();

+			fConditionalUnitIfCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitIfCompartmentFigure);

+

+			fConditionalUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fConditionalUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitHelperUnitsCompartmentFigure);

+

+			fConditionalUnitThenCompartmentFigure = new RectangleFigure();

+			fConditionalUnitThenCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitThenCompartmentFigure);

+

+			fConditionalUnitElseCompartmentFigure = new RectangleFigure();

+			fConditionalUnitElseCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitElseCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionalUnitLabelFigure() {

+			return fFigureConditionalUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitIfCompartmentFigure() {

+			return fConditionalUnitIfCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitHelperUnitsCompartmentFigure() {

+			return fConditionalUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitThenCompartmentFigure() {

+			return fConditionalUnitThenCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitElseCompartmentFigure() {

+			return fConditionalUnitElseCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit3EditPart.java
new file mode 100644
index 0000000..c49d015
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit3EditPart.java
@@ -0,0 +1,493 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionalUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnit3ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3046;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new ConditionalUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitFigure getPrimaryShape() {

+		return (ConditionalUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType3EditPart) {

+			((ConditionalUnitNameType3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionalUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitIfCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitThenCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitElseCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitIfCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitThenCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitElseCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment2EditPart) {

+			return getPrimaryShape().getConditionalUnitIfCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart) {

+			return getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment2EditPart) {

+			return getPrimaryShape().getConditionalUnitThenCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment2EditPart) {

+			return getPrimaryShape().getConditionalUnitElseCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionalUnitNameType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionalUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionalUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitIfCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitThenCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitElseCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionalUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionalUnitLabelFigure = new WrappingLabel();

+			fFigureConditionalUnitLabelFigure.setText("ConditionalUnit");

+			fFigureConditionalUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureConditionalUnitLabelFigure);

+

+			fConditionalUnitIfCompartmentFigure = new RectangleFigure();

+			fConditionalUnitIfCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitIfCompartmentFigure);

+

+			fConditionalUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fConditionalUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitHelperUnitsCompartmentFigure);

+

+			fConditionalUnitThenCompartmentFigure = new RectangleFigure();

+			fConditionalUnitThenCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitThenCompartmentFigure);

+

+			fConditionalUnitElseCompartmentFigure = new RectangleFigure();

+			fConditionalUnitElseCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitElseCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionalUnitLabelFigure() {

+			return fFigureConditionalUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitIfCompartmentFigure() {

+			return fConditionalUnitIfCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitHelperUnitsCompartmentFigure() {

+			return fConditionalUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitThenCompartmentFigure() {

+			return fConditionalUnitThenCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitElseCompartmentFigure() {

+			return fConditionalUnitElseCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit4EditPart.java
new file mode 100644
index 0000000..d28f6f0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit4EditPart.java
@@ -0,0 +1,493 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionalUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnit4ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3066;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new ConditionalUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitFigure getPrimaryShape() {

+		return (ConditionalUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType4EditPart) {

+			((ConditionalUnitNameType4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionalUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitIfCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitThenCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitElseCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitIfCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitThenCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitElseCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment3EditPart) {

+			return getPrimaryShape().getConditionalUnitIfCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart) {

+			return getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment3EditPart) {

+			return getPrimaryShape().getConditionalUnitThenCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment3EditPart) {

+			return getPrimaryShape().getConditionalUnitElseCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionalUnitNameType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionalUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionalUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitIfCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitThenCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitElseCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionalUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionalUnitLabelFigure = new WrappingLabel();

+			fFigureConditionalUnitLabelFigure.setText("ConditionalUnit");

+			fFigureConditionalUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureConditionalUnitLabelFigure);

+

+			fConditionalUnitIfCompartmentFigure = new RectangleFigure();

+			fConditionalUnitIfCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitIfCompartmentFigure);

+

+			fConditionalUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fConditionalUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitHelperUnitsCompartmentFigure);

+

+			fConditionalUnitThenCompartmentFigure = new RectangleFigure();

+			fConditionalUnitThenCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitThenCompartmentFigure);

+

+			fConditionalUnitElseCompartmentFigure = new RectangleFigure();

+			fConditionalUnitElseCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitElseCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionalUnitLabelFigure() {

+			return fFigureConditionalUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitIfCompartmentFigure() {

+			return fConditionalUnitIfCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitHelperUnitsCompartmentFigure() {

+			return fConditionalUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitThenCompartmentFigure() {

+			return fConditionalUnitThenCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitElseCompartmentFigure() {

+			return fConditionalUnitElseCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit5EditPart.java
new file mode 100644
index 0000000..5b4bb89
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit5EditPart.java
@@ -0,0 +1,493 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionalUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnit5ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3071;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new ConditionalUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitFigure getPrimaryShape() {

+		return (ConditionalUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType5EditPart) {

+			((ConditionalUnitNameType5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionalUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitIfCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitThenCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitElseCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitIfCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitThenCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitElseCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment4EditPart) {

+			return getPrimaryShape().getConditionalUnitIfCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart) {

+			return getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment4EditPart) {

+			return getPrimaryShape().getConditionalUnitThenCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment4EditPart) {

+			return getPrimaryShape().getConditionalUnitElseCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionalUnitNameType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionalUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionalUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitIfCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitThenCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitElseCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionalUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionalUnitLabelFigure = new WrappingLabel();

+			fFigureConditionalUnitLabelFigure.setText("ConditionalUnit");

+			fFigureConditionalUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureConditionalUnitLabelFigure);

+

+			fConditionalUnitIfCompartmentFigure = new RectangleFigure();

+			fConditionalUnitIfCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitIfCompartmentFigure);

+

+			fConditionalUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fConditionalUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitHelperUnitsCompartmentFigure);

+

+			fConditionalUnitThenCompartmentFigure = new RectangleFigure();

+			fConditionalUnitThenCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitThenCompartmentFigure);

+

+			fConditionalUnitElseCompartmentFigure = new RectangleFigure();

+			fConditionalUnitElseCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitElseCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionalUnitLabelFigure() {

+			return fFigureConditionalUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitIfCompartmentFigure() {

+			return fConditionalUnitIfCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitHelperUnitsCompartmentFigure() {

+			return fConditionalUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitThenCompartmentFigure() {

+			return fConditionalUnitThenCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitElseCompartmentFigure() {

+			return fConditionalUnitElseCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit6EditPart.java
new file mode 100644
index 0000000..c2e85ac
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit6EditPart.java
@@ -0,0 +1,493 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionalUnit6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnit6ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit6EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3072;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnit6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnit6CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new ConditionalUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitFigure getPrimaryShape() {

+		return (ConditionalUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType6EditPart) {

+			((ConditionalUnitNameType6EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionalUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitIfCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitThenCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitElseCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType6EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitIfCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitThenCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitElseCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment5EditPart) {

+			return getPrimaryShape().getConditionalUnitIfCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart) {

+			return getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment5EditPart) {

+			return getPrimaryShape().getConditionalUnitThenCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment5EditPart) {

+			return getPrimaryShape().getConditionalUnitElseCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionalUnitNameType6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionalUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionalUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitIfCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitThenCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitElseCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionalUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionalUnitLabelFigure = new WrappingLabel();

+			fFigureConditionalUnitLabelFigure.setText("ConditionalUnit");

+			fFigureConditionalUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureConditionalUnitLabelFigure);

+

+			fConditionalUnitIfCompartmentFigure = new RectangleFigure();

+			fConditionalUnitIfCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitIfCompartmentFigure);

+

+			fConditionalUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fConditionalUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitHelperUnitsCompartmentFigure);

+

+			fConditionalUnitThenCompartmentFigure = new RectangleFigure();

+			fConditionalUnitThenCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitThenCompartmentFigure);

+

+			fConditionalUnitElseCompartmentFigure = new RectangleFigure();

+			fConditionalUnitElseCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitElseCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionalUnitLabelFigure() {

+			return fFigureConditionalUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitIfCompartmentFigure() {

+			return fConditionalUnitIfCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitHelperUnitsCompartmentFigure() {

+			return fConditionalUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitThenCompartmentFigure() {

+			return fConditionalUnitThenCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitElseCompartmentFigure() {

+			return fConditionalUnitElseCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit7EditPart.java
new file mode 100644
index 0000000..8cbdf24
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnit7EditPart.java
@@ -0,0 +1,493 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionalUnit7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnit7ItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit7EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3075;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnit7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnit7CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new ConditionalUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitFigure getPrimaryShape() {

+		return (ConditionalUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType7EditPart) {

+			((ConditionalUnitNameType7EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionalUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitIfCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitThenCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitElseCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameType7EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitIfCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitThenCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitElseCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment6EditPart) {

+			return getPrimaryShape().getConditionalUnitIfCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart) {

+			return getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment6EditPart) {

+			return getPrimaryShape().getConditionalUnitThenCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment6EditPart) {

+			return getPrimaryShape().getConditionalUnitElseCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionalUnitNameType7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionalUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionalUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitIfCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitThenCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitElseCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionalUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionalUnitLabelFigure = new WrappingLabel();

+			fFigureConditionalUnitLabelFigure.setText("ConditionalUnit");

+			fFigureConditionalUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureConditionalUnitLabelFigure);

+

+			fConditionalUnitIfCompartmentFigure = new RectangleFigure();

+			fConditionalUnitIfCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitIfCompartmentFigure);

+

+			fConditionalUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fConditionalUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitHelperUnitsCompartmentFigure);

+

+			fConditionalUnitThenCompartmentFigure = new RectangleFigure();

+			fConditionalUnitThenCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitThenCompartmentFigure);

+

+			fConditionalUnitElseCompartmentFigure = new RectangleFigure();

+			fConditionalUnitElseCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitElseCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionalUnitLabelFigure() {

+			return fFigureConditionalUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitIfCompartmentFigure() {

+			return fConditionalUnitIfCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitHelperUnitsCompartmentFigure() {

+			return fConditionalUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitThenCompartmentFigure() {

+			return fConditionalUnitThenCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitElseCompartmentFigure() {

+			return fConditionalUnitElseCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment2EditPart.java
new file mode 100644
index 0000000..200818d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment2EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment2EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7038;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitElseCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment3EditPart.java
new file mode 100644
index 0000000..4cbc743
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment3EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment3EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7054;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitElseCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment4EditPart.java
new file mode 100644
index 0000000..cea3539
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment4EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment4EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7064;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitElseCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment5EditPart.java
new file mode 100644
index 0000000..081435d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment5EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment5EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7068;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitElseCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment6EditPart.java
new file mode 100644
index 0000000..e643a1e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment6EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment6EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7074;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitElseCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment7EditPart.java
new file mode 100644
index 0000000..90cbcc6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartment7EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment7EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7084;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitElseCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartmentEditPart.java
new file mode 100644
index 0000000..cef8e31
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitElseCompartmentEditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitElseCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartmentEditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7020;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitElseCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitElseCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.java
new file mode 100644
index 0000000..0b0beb1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7036;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.java
new file mode 100644
index 0000000..4a265ca
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7052;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.java
new file mode 100644
index 0000000..cfde887
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7062;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.java
new file mode 100644
index 0000000..0666089
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7066;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.java
new file mode 100644
index 0000000..2d6c529
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7072;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.java
new file mode 100644
index 0000000..3690b62
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7082;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.java
new file mode 100644
index 0000000..123cb88
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitHelperUnitsCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7018;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitHelperUnitsCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment2EditPart.java
new file mode 100644
index 0000000..a1b9780
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment2EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment2EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7035;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitIfCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment3EditPart.java
new file mode 100644
index 0000000..deccc76
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment3EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment3EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7051;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitIfCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment4EditPart.java
new file mode 100644
index 0000000..2692cb4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment4EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment4EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7061;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitIfCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment5EditPart.java
new file mode 100644
index 0000000..ad6ed24
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment5EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment5EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7065;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitIfCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment6EditPart.java
new file mode 100644
index 0000000..38d3f6c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment6EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment6EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7071;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitIfCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment7EditPart.java
new file mode 100644
index 0000000..63ec946
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartment7EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment7EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7081;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitIfCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartmentEditPart.java
new file mode 100644
index 0000000..e7ce2b1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitIfCompartmentEditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitIfCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartmentEditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7017;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitIfCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitIfCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment2EditPart.java
new file mode 100644
index 0000000..59f2eae
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment2EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment2EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7037;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitThenCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment3EditPart.java
new file mode 100644
index 0000000..53032b8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment3EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment3EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7053;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitThenCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment4EditPart.java
new file mode 100644
index 0000000..e521b3e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment4EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment4EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7063;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitThenCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment5EditPart.java
new file mode 100644
index 0000000..e4acd48
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment5EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment5EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7067;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitThenCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment6EditPart.java
new file mode 100644
index 0000000..94f12ca
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment6EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment6EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7073;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitThenCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment7EditPart.java
new file mode 100644
index 0000000..7f430f2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartment7EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment7EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7083;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitThenCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartmentEditPart.java
new file mode 100644
index 0000000..d11b1ba
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitConditionalUnitThenCompartmentEditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitConditionalUnitThenCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartmentEditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7019;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ConditionalUnitConditionalUnitThenCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitConditionalUnitThenCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitEditPart.java
new file mode 100644
index 0000000..e8343f0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitEditPart.java
@@ -0,0 +1,508 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EcorePackage;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.ConditionalUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ConditionalUnitItemSemanticEditPolicy;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2006;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ConditionalUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ConditionalUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new ConditionalUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitFigure getPrimaryShape() {

+		return (ConditionalUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameTypeEditPart) {

+			((ConditionalUnitNameTypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureConditionalUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitIfCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitThenCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ConditionalUnitConditionalUnitElseCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort9EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ConditionalUnitNameTypeEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitIfCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitIfCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitIfCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitThenCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitThenCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitThenCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ConditionalUnitConditionalUnitElseCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getConditionalUnitElseCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ConditionalUnitConditionalUnitElseCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort9EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort9EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment7EditPart) {

+			return getPrimaryShape().getConditionalUnitIfCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart) {

+			return getPrimaryShape()

+					.getConditionalUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment7EditPart) {

+			return getPrimaryShape().getConditionalUnitThenCompartmentFigure();

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment7EditPart) {

+			return getPrimaryShape().getConditionalUnitElseCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ConditionalUnitNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		if (event.getNotifier() == getModel()

+				&& EcorePackage.eINSTANCE.getEModelElement_EAnnotations()

+						.equals(event.getFeature())) {

+			handleMajorSemanticChange();

+		} else {

+			super.handleNotificationEvent(event);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ConditionalUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureConditionalUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitIfCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitThenCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fConditionalUnitElseCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ConditionalUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureConditionalUnitLabelFigure = new WrappingLabel();

+			fFigureConditionalUnitLabelFigure.setText("ConditionalUnit");

+			fFigureConditionalUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureConditionalUnitLabelFigure);

+

+			fConditionalUnitIfCompartmentFigure = new RectangleFigure();

+			fConditionalUnitIfCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitIfCompartmentFigure);

+

+			fConditionalUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fConditionalUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitHelperUnitsCompartmentFigure);

+

+			fConditionalUnitThenCompartmentFigure = new RectangleFigure();

+			fConditionalUnitThenCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitThenCompartmentFigure);

+

+			fConditionalUnitElseCompartmentFigure = new RectangleFigure();

+			fConditionalUnitElseCompartmentFigure.setOutline(false);

+

+			this.add(fConditionalUnitElseCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureConditionalUnitLabelFigure() {

+			return fFigureConditionalUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitIfCompartmentFigure() {

+			return fConditionalUnitIfCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitHelperUnitsCompartmentFigure() {

+			return fConditionalUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitThenCompartmentFigure() {

+			return fConditionalUnitThenCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getConditionalUnitElseCompartmentFigure() {

+			return fConditionalUnitElseCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType2EditPart.java
new file mode 100644
index 0000000..e67f335
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitNameType2EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5072;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionalUnit_3030,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionalUnitNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType3EditPart.java
new file mode 100644
index 0000000..5a0fa40
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitNameType3EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5065;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitNameType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionalUnit_3046,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionalUnitNameType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType4EditPart.java
new file mode 100644
index 0000000..56a2b31
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitNameType4EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5060;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitNameType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionalUnit_3066,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionalUnitNameType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType5EditPart.java
new file mode 100644
index 0000000..3eccb94
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitNameType5EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5057;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitNameType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionalUnit_3071,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionalUnitNameType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType6EditPart.java
new file mode 100644
index 0000000..6b83351
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType6EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitNameType6EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5056;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitNameType6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionalUnit_3072,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionalUnitNameType6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType7EditPart.java
new file mode 100644
index 0000000..a0ae612
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameType7EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitNameType7EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5055;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitNameType7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionalUnit_3075,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionalUnitNameType7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameTypeEditPart.java
new file mode 100644
index 0000000..69e7e39
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ConditionalUnitNameTypeEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitNameTypeEditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5084;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ConditionalUnit_2006,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ConditionalUnitNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit2EditPart.java
new file mode 100644
index 0000000..f077597
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit2EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFeatureUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFeatureUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3039;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFeatureUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFeatureUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort5EditPart.VISUAL_ID:

+				case MultiInputPort4EditPart.VISUAL_ID:

+				case MultiOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitFigure getPrimaryShape() {

+		return (MultiFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType2EditPart) {

+			((MultiFeatureUnitNameType2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnitNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFeatureUnitLabelFigure.setText("MultiFeatureUnit");

+

+			this.add(fFigureMultiFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFeatureUnitLabelFigure() {

+			return fFigureMultiFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit3EditPart.java
new file mode 100644
index 0000000..490af8e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit3EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFeatureUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFeatureUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3051;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFeatureUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFeatureUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort5EditPart.VISUAL_ID:

+				case MultiInputPort4EditPart.VISUAL_ID:

+				case MultiOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitFigure getPrimaryShape() {

+		return (MultiFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType3EditPart) {

+			((MultiFeatureUnitNameType3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnitNameType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFeatureUnitLabelFigure.setText("MultiFeatureUnit");

+

+			this.add(fFigureMultiFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFeatureUnitLabelFigure() {

+			return fFigureMultiFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit4EditPart.java
new file mode 100644
index 0000000..13f8fd1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit4EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFeatureUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFeatureUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3056;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFeatureUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFeatureUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort5EditPart.VISUAL_ID:

+				case MultiInputPort4EditPart.VISUAL_ID:

+				case MultiOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitFigure getPrimaryShape() {

+		return (MultiFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType4EditPart) {

+			((MultiFeatureUnitNameType4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnitNameType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFeatureUnitLabelFigure.setText("MultiFeatureUnit");

+

+			this.add(fFigureMultiFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFeatureUnitLabelFigure() {

+			return fFigureMultiFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit5EditPart.java
new file mode 100644
index 0000000..24991c1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnit5EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFeatureUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFeatureUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3062;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFeatureUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFeatureUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort5EditPart.VISUAL_ID:

+				case MultiInputPort4EditPart.VISUAL_ID:

+				case MultiOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitFigure getPrimaryShape() {

+		return (MultiFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType5EditPart) {

+			((MultiFeatureUnitNameType5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameType5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnitNameType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFeatureUnitLabelFigure.setText("MultiFeatureUnit");

+

+			this.add(fFigureMultiFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFeatureUnitLabelFigure() {

+			return fFigureMultiFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitEditPart.java
new file mode 100644
index 0000000..c47a908
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitEditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFeatureUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFeatureUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3012;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFeatureUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFeatureUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort5EditPart.VISUAL_ID:

+				case MultiInputPort4EditPart.VISUAL_ID:

+				case MultiOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitFigure getPrimaryShape() {

+		return (MultiFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameTypeEditPart) {

+			((MultiFeatureUnitNameTypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFeatureUnitNameTypeEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort4EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnitNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFeatureUnitLabelFigure.setText("MultiFeatureUnit");

+

+			this.add(fFigureMultiFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFeatureUnitLabelFigure() {

+			return fFigureMultiFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType2EditPart.java
new file mode 100644
index 0000000..a46b4d8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitNameType2EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5030;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFeatureUnit_3039,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFeatureUnitNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType3EditPart.java
new file mode 100644
index 0000000..d531d5c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitNameType3EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5037;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitNameType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFeatureUnit_3051,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFeatureUnitNameType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType4EditPart.java
new file mode 100644
index 0000000..6223ef7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitNameType4EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5041;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitNameType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFeatureUnit_3056,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFeatureUnitNameType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType5EditPart.java
new file mode 100644
index 0000000..2ad4625
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameType5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitNameType5EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5045;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitNameType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFeatureUnit_3062,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFeatureUnitNameType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameTypeEditPart.java
new file mode 100644
index 0000000..291a2bd
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFeatureUnitNameTypeEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitNameTypeEditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5013;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFeatureUnit_3012,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFeatureUnitNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit2EditPart.java
new file mode 100644
index 0000000..f9153eb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit2EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFilterUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFilterUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3041;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFilterUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFilterUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort6EditPart.VISUAL_ID:

+				case MultiOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitFigure getPrimaryShape() {

+		return (MultiFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType2EditPart) {

+			((MultiFilterUnitNameType2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFilterUnitNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFilterUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFilterUnitLabelFigure.setText("MultiFilterUnit");

+

+			this.add(fFigureMultiFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFilterUnitLabelFigure() {

+			return fFigureMultiFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit3EditPart.java
new file mode 100644
index 0000000..01d2439
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit3EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFilterUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFilterUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3053;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFilterUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFilterUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort6EditPart.VISUAL_ID:

+				case MultiOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitFigure getPrimaryShape() {

+		return (MultiFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType3EditPart) {

+			((MultiFilterUnitNameType3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFilterUnitNameType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFilterUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFilterUnitLabelFigure.setText("MultiFilterUnit");

+

+			this.add(fFigureMultiFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFilterUnitLabelFigure() {

+			return fFigureMultiFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit4EditPart.java
new file mode 100644
index 0000000..1e00024
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit4EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFilterUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFilterUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3058;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFilterUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFilterUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort6EditPart.VISUAL_ID:

+				case MultiOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitFigure getPrimaryShape() {

+		return (MultiFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType4EditPart) {

+			((MultiFilterUnitNameType4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFilterUnitNameType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFilterUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFilterUnitLabelFigure.setText("MultiFilterUnit");

+

+			this.add(fFigureMultiFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFilterUnitLabelFigure() {

+			return fFigureMultiFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit5EditPart.java
new file mode 100644
index 0000000..ed14283
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnit5EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFilterUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFilterUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3064;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFilterUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFilterUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort6EditPart.VISUAL_ID:

+				case MultiOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitFigure getPrimaryShape() {

+		return (MultiFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType5EditPart) {

+			((MultiFilterUnitNameType5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOt

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameType5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFilterUnitNameType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFilterUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFilterUnitLabelFigure.setText("MultiFilterUnit");

+

+			this.add(fFigureMultiFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFilterUnitLabelFigure() {

+			return fFigureMultiFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitEditPart.java
new file mode 100644
index 0000000..fb2ba2a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitEditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.MultiFilterUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.MultiFilterUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3019;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiFilterUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new MultiFilterUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort6EditPart.VISUAL_ID:

+				case MultiOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new MultiFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitFigure getPrimaryShape() {

+		return (MultiFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameTypeEditPart) {

+			((MultiFilterUnitNameTypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureMultiFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof MultiFilterUnitNameTypeEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort6EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiFilterUnitNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureMultiFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultiFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureMultiFilterUnitLabelFigure = new WrappingLabel();

+			fFigureMultiFilterUnitLabelFigure.setText("MultiFilterUnit");

+

+			this.add(fFigureMultiFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureMultiFilterUnitLabelFigure() {

+			return fFigureMultiFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType2EditPart.java
new file mode 100644
index 0000000..30d30e4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitNameType2EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5032;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFilterUnit_3041,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFilterUnitNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType3EditPart.java
new file mode 100644
index 0000000..f7a21c3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitNameType3EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5039;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitNameType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFilterUnit_3053,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFilterUnitNameType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType4EditPart.java
new file mode 100644
index 0000000..0113c8f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitNameType4EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5043;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitNameType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFilterUnit_3058,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFilterUnitNameType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType5EditPart.java
new file mode 100644
index 0000000..7e77a99
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameType5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitNameType5EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5047;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitNameType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFilterUnit_3064,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFilterUnitNameType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameTypeEditPart.java
new file mode 100644
index 0000000..37f9c2e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiFilterUnitNameTypeEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitNameTypeEditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5019;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiFilterUnit_3019,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiFilterUnitNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort2EditPart.java
new file mode 100644
index 0000000..8e0f651
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort2EditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPort2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort2EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3006;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort3EditPart.java
new file mode 100644
index 0000000..a026690
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort3EditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPort3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort3EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3010;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType3EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort4EditPart.java
new file mode 100644
index 0000000..ad617f5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort4EditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPort4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort4EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3014;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType4EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort5EditPart.java
new file mode 100644
index 0000000..01e7cbf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort5EditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPort5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort5EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3017;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType5EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort6EditPart.java
new file mode 100644
index 0000000..240953d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort6EditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPort6ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort6EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3020;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType6EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort7EditPart.java
new file mode 100644
index 0000000..e8f87ef
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort7EditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPort7ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort7EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3024;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort8EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort8EditPart.java
new file mode 100644
index 0000000..7f37710
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort8EditPart.java
@@ -0,0 +1,407 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.policies.MultiInputPort8ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort8EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3028;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort8EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort8ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType8EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort9EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort9EditPart.java
new file mode 100644
index 0000000..dabe97d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPort9EditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPort9ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPort9EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3032;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort9EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPort9ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameType9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameType9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameType9EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortEditPart.java
new file mode 100644
index 0000000..83452d1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortEditPart.java
@@ -0,0 +1,408 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart.MultiInputPortFigure;

+import comrel.diagram.edit.policies.MultiInputPortItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiInputPortEditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3002;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiInputPortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPortNameTypeEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiInputPortFigure figure = new MultiInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortFigure getPrimaryShape() {

+		return (MultiInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiInputPortNameTypeEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiInputPortNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof comrel.diagram.edit.parts.MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType2EditPart.java
new file mode 100644
index 0000000..61c9303
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType2EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType2EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5005;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType2EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3006,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType3EditPart.java
new file mode 100644
index 0000000..eef19c6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType3EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType3EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5007;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType3EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3010,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType4EditPart.java
new file mode 100644
index 0000000..a9e34db
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType4EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType4EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5011;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType4EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3014,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType5EditPart.java
new file mode 100644
index 0000000..e1cef15
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType5EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType5EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5014;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType5EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3017,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType6EditPart.java
new file mode 100644
index 0000000..5c56d55
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType6EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType6EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5017;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType6EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3020,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType7EditPart.java
new file mode 100644
index 0000000..06a8e59
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType7EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType7EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5021;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType7EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3024,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType8EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType8EditPart.java
new file mode 100644
index 0000000..22081df
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType8EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType8EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5023;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType8EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType8EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3028,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType8EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType9EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType9EditPart.java
new file mode 100644
index 0000000..d35e6d0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameType9EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameType9EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5025;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameType9EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameType9EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3032,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameType9EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameTypeEditPart.java
new file mode 100644
index 0000000..fab8aa5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiInputPortNameTypeEditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiInputPortNameTypeEditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5003;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiInputPortNameTypeEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiInputPort_3002,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiInputPortNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiInputPortLabelFigure() {

+			this.setText("MultiInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPort2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPort2EditPart.java
new file mode 100644
index 0000000..e12e607
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPort2EditPart.java
@@ -0,0 +1,377 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.Ellipse;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.OutputPort;

+import comrel.diagram.edit.policies.MultiOutputPort2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.OutputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiOutputPort2EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3021;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPort2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiOutputPort2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiOutputPortNameType2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiOutputPortFigure figure = new MultiOutputPortFigure();

+		OutputPort port = (OutputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPortFigure getPrimaryShape() {

+		return (MultiOutputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiOutputPortNameType2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiOutputPortNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiOutputPortFigure extends OutputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiOutputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortEditPart.java
new file mode 100644
index 0000000..a9442d5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortEditPart.java
@@ -0,0 +1,377 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.Ellipse;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.OutputPort;

+import comrel.diagram.edit.policies.MultiOutputPortItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.OutputPortFigure;

+

+/**

+ * @generated

+ */

+public class MultiOutputPortEditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3015;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPortEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiOutputPortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiOutputPortNameTypeEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		MultiOutputPortFigure figure = new MultiOutputPortFigure();

+		OutputPort port = (OutputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPortFigure getPrimaryShape() {

+		return (MultiOutputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof MultiOutputPortNameTypeEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(MultiOutputPortNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiPortMapping_4002);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiPortMapping_4002);

+		}

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.MultiPortMapping_4002) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiOutputPortFigure extends OutputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiOutputPortFigure() {

+			this.setLineWidth(10);

+			this.setForegroundColor(THIS_FORE);

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	static final Color THIS_FORE = new Color(null, 255, 0, 0);

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortNameType2EditPart.java
new file mode 100644
index 0000000..d8f67c7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortNameType2EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiOutputPortNameType2EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5018;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiOutputPortNameType2EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPortNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiOutputPort_3021,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiOutputPortNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiOutputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiOutputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiOutputPortLabelFigure() {

+			this.setText("MultiOutputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortNameTypeEditPart.java
new file mode 100644
index 0000000..dd53007
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiOutputPortNameTypeEditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class MultiOutputPortNameTypeEditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5012;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.MultiOutputPortNameTypeEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPortNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.MultiOutputPort_3015,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.MultiOutputPortNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 MultiOutputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class MultiOutputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public MultiOutputPortLabelFigure() {

+			this.setText("MultiOutputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiPortMappingEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiPortMappingEditPart.java
new file mode 100644
index 0000000..1368a86
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiPortMappingEditPart.java
@@ -0,0 +1,95 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.PolylineDecoration;

+import org.eclipse.draw2d.RotatableDecoration;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.PortMapping;

+import comrel.diagram.edit.policies.MultiPortMappingItemSemanticEditPolicy;

+import comrel.figures.PortMappingFigure;

+

+/**

+ * @generated

+ */

+public class MultiPortMappingEditPart extends ConnectionNodeEditPart implements

+		ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4002;

+

+	/**

+	 * @generated

+	 */

+	public MultiPortMappingEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiPortMappingItemSemanticEditPolicy());

+	}

+

+	/**

+	 * 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 NOT

+	 */

+

+	protected Connection createConnectionFigure() {

+		PortMapping mapping = (PortMapping) this.resolveSemanticElement();

+		PortMappingFigure figure = new MultiPortMappingFigure();

+		figure.setMapping(mapping);

+		return figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiPortMappingFigure getPrimaryShape() {

+		return (MultiPortMappingFigure) getFigure();

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiPortMappingFigure extends PortMappingFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiPortMappingFigure() {

+			this.setLineWidth(2);

+			this.setLineStyle(Graphics.LINE_DOT);

+

+			setTargetDecoration(createTargetDecoration());

+		}

+

+		/**

+		 * @generated

+		 */

+		private RotatableDecoration createTargetDecoration() {

+			PolylineDecoration df = new PolylineDecoration();

+			return df;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiSinglePortMappingEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiSinglePortMappingEditPart.java
new file mode 100644
index 0000000..21784a1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/MultiSinglePortMappingEditPart.java
@@ -0,0 +1,95 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.PolylineDecoration;

+import org.eclipse.draw2d.RotatableDecoration;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.PortMapping;

+import comrel.diagram.edit.policies.MultiSinglePortMappingItemSemanticEditPolicy;

+import comrel.figures.PortMappingFigure;

+

+/**

+ * @generated

+ */

+public class MultiSinglePortMappingEditPart extends ConnectionNodeEditPart

+		implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4003;

+

+	/**

+	 * @generated

+	 */

+	public MultiSinglePortMappingEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new MultiSinglePortMappingItemSemanticEditPolicy());

+	}

+

+	/**

+	 * 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 NOT

+	 */

+

+	protected Connection createConnectionFigure() {

+		PortMapping mapping = (PortMapping) this.resolveSemanticElement();

+		PortMappingFigure figure = new MultiSinglePortMappingFigure();

+		figure.setMapping(mapping);

+		return figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public MultiSinglePortMappingFigure getPrimaryShape() {

+		return (MultiSinglePortMappingFigure) getFigure();

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class MultiSinglePortMappingFigure extends PortMappingFigure {

+

+		/**

+		 * @generated

+		 */

+		public MultiSinglePortMappingFigure() {

+			this.setLineWidth(2);

+			this.setLineStyle(Graphics.LINE_DOT);

+

+			setTargetDecoration(createTargetDecoration());

+		}

+

+		/**

+		 * @generated

+		 */

+		private RotatableDecoration createTargetDecoration() {

+			PolylineDecoration df = new PolylineDecoration();

+			return df;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit2EditPart.java
new file mode 100644
index 0000000..c47e855
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit2EditPart.java
@@ -0,0 +1,438 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart.ParallelQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3004;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		ParallelQueuedUnitFigure figure = new ParallelQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitFigure getPrimaryShape() {

+		return (ParallelQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict2EditPart) {

+			((ParallelQueuedUnitNameTypeLblStrict2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureParallelQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ParallelQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureParallelQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ParallelQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureParallelQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureParallelQueuedUnitLabelFigure.setText("ParallelQueuedUnit");

+			fFigureParallelQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureParallelQueuedUnitLabelFigure);

+

+			fParallelQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fParallelQueuedUnitHelperUnitsCompartmentFigure);

+

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure

+					.setOutline(false);

+

+			this.add(fParallelQueuedUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureParallelQueuedUnitLabelFigure() {

+			return fFigureParallelQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitHelperUnitsCompartmentFigure() {

+			return fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitRefactoringUnitsCompartmentFigure() {

+			return fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit3EditPart.java
new file mode 100644
index 0000000..d578559
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit3EditPart.java
@@ -0,0 +1,438 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart.ParallelQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3036;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		ParallelQueuedUnitFigure figure = new ParallelQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitFigure getPrimaryShape() {

+		return (ParallelQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict3EditPart) {

+			((ParallelQueuedUnitNameTypeLblStrict3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureParallelQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ParallelQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureParallelQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ParallelQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureParallelQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureParallelQueuedUnitLabelFigure.setText("ParallelQueuedUnit");

+			fFigureParallelQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureParallelQueuedUnitLabelFigure);

+

+			fParallelQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fParallelQueuedUnitHelperUnitsCompartmentFigure);

+

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure

+					.setOutline(false);

+

+			this.add(fParallelQueuedUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureParallelQueuedUnitLabelFigure() {

+			return fFigureParallelQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitHelperUnitsCompartmentFigure() {

+			return fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitRefactoringUnitsCompartmentFigure() {

+			return fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit4EditPart.java
new file mode 100644
index 0000000..5df870a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit4EditPart.java
@@ -0,0 +1,438 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart.ParallelQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3037;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		ParallelQueuedUnitFigure figure = new ParallelQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitFigure getPrimaryShape() {

+		return (ParallelQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict4EditPart) {

+			((ParallelQueuedUnitNameTypeLblStrict4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureParallelQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ParallelQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureParallelQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ParallelQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureParallelQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureParallelQueuedUnitLabelFigure.setText("ParallelQueuedUnit");

+			fFigureParallelQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureParallelQueuedUnitLabelFigure);

+

+			fParallelQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fParallelQueuedUnitHelperUnitsCompartmentFigure);

+

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure

+					.setOutline(false);

+

+			this.add(fParallelQueuedUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureParallelQueuedUnitLabelFigure() {

+			return fFigureParallelQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitHelperUnitsCompartmentFigure() {

+			return fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitRefactoringUnitsCompartmentFigure() {

+			return fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit5EditPart.java
new file mode 100644
index 0000000..23800ba
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit5EditPart.java
@@ -0,0 +1,438 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart.ParallelQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3043;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		ParallelQueuedUnitFigure figure = new ParallelQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitFigure getPrimaryShape() {

+		return (ParallelQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict5EditPart) {

+			((ParallelQueuedUnitNameTypeLblStrict5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureParallelQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ParallelQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureParallelQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ParallelQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureParallelQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureParallelQueuedUnitLabelFigure.setText("ParallelQueuedUnit");

+			fFigureParallelQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureParallelQueuedUnitLabelFigure);

+

+			fParallelQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fParallelQueuedUnitHelperUnitsCompartmentFigure);

+

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure

+					.setOutline(false);

+

+			this.add(fParallelQueuedUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureParallelQueuedUnitLabelFigure() {

+			return fFigureParallelQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitHelperUnitsCompartmentFigure() {

+			return fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitRefactoringUnitsCompartmentFigure() {

+			return fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit6EditPart.java
new file mode 100644
index 0000000..2d330a2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit6EditPart.java
@@ -0,0 +1,439 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart.ParallelQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit6ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit6EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3045;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnit6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnit6CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		ParallelQueuedUnitFigure figure = new ParallelQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitFigure getPrimaryShape() {

+		return (ParallelQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict6EditPart) {

+			((ParallelQueuedUnitNameTypeLblStrict6EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureParallelQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict6EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ParallelQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureParallelQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ParallelQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureParallelQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureParallelQueuedUnitLabelFigure.setText("ParallelQueuedUnit");

+			fFigureParallelQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureParallelQueuedUnitLabelFigure);

+

+			fParallelQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fParallelQueuedUnitHelperUnitsCompartmentFigure);

+

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure

+					.setOutline(false);

+

+			this.add(fParallelQueuedUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureParallelQueuedUnitLabelFigure() {

+			return fFigureParallelQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitHelperUnitsCompartmentFigure() {

+			return fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitRefactoringUnitsCompartmentFigure() {

+			return fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit7EditPart.java
new file mode 100644
index 0000000..d8d3adb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnit7EditPart.java
@@ -0,0 +1,438 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnit7ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit7EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3048;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnit7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnit7CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		ParallelQueuedUnitFigure figure = new ParallelQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitFigure getPrimaryShape() {

+		return (ParallelQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict7EditPart) {

+			((ParallelQueuedUnitNameTypeLblStrict7EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureParallelQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrict7EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ParallelQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureParallelQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ParallelQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureParallelQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureParallelQueuedUnitLabelFigure.setText("ParallelQueuedUnit");

+			fFigureParallelQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureParallelQueuedUnitLabelFigure);

+

+			fParallelQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fParallelQueuedUnitHelperUnitsCompartmentFigure);

+

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure

+					.setOutline(false);

+

+			this.add(fParallelQueuedUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureParallelQueuedUnitLabelFigure() {

+			return fFigureParallelQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitHelperUnitsCompartmentFigure() {

+			return fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitRefactoringUnitsCompartmentFigure() {

+			return fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitEditPart.java
new file mode 100644
index 0000000..c83d6e5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitEditPart.java
@@ -0,0 +1,453 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EcorePackage;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart.ParallelQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2003;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		ParallelQueuedUnitFigure figure = new ParallelQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitFigure getPrimaryShape() {

+		return (ParallelQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrictEditPart) {

+			((ParallelQueuedUnitNameTypeLblStrictEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureParallelQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof ParallelQueuedUnitNameTypeLblStrictEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart) {

+			return getPrimaryShape()

+					.getParallelQueuedUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		if (event.getNotifier() == getModel()

+				&& EcorePackage.eINSTANCE.getEModelElement_EAnnotations()

+						.equals(event.getFeature())) {

+			handleMajorSemanticChange();

+		} else {

+			super.handleNotificationEvent(event);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public class ParallelQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureParallelQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public ParallelQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureParallelQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureParallelQueuedUnitLabelFigure.setText("ParallelQueuedUnit");

+			fFigureParallelQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureParallelQueuedUnitLabelFigure);

+

+			fParallelQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fParallelQueuedUnitHelperUnitsCompartmentFigure);

+

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fParallelQueuedUnitRefactoringUnitsCompartmentFigure

+					.setOutline(false);

+

+			this.add(fParallelQueuedUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureParallelQueuedUnitLabelFigure() {

+			return fFigureParallelQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitHelperUnitsCompartmentFigure() {

+			return fParallelQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getParallelQueuedUnitRefactoringUnitsCompartmentFigure() {

+			return fParallelQueuedUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict2EditPart.java
new file mode 100644
index 0000000..417247b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitNameTypeLblStrict2EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5078;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitNameTypeLblStrict2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ParallelQueuedUnit_3004,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict3EditPart.java
new file mode 100644
index 0000000..a916514
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitNameTypeLblStrict3EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5071;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitNameTypeLblStrict3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ParallelQueuedUnit_3036,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict4EditPart.java
new file mode 100644
index 0000000..7197b0e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitNameTypeLblStrict4EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5070;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitNameTypeLblStrict4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ParallelQueuedUnit_3037,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict5EditPart.java
new file mode 100644
index 0000000..0e62774
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitNameTypeLblStrict5EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5068;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitNameTypeLblStrict5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ParallelQueuedUnit_3043,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict6EditPart.java
new file mode 100644
index 0000000..404dfe8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict6EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitNameTypeLblStrict6EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5066;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitNameTypeLblStrict6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ParallelQueuedUnit_3045,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict7EditPart.java
new file mode 100644
index 0000000..c3fe75f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrict7EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitNameTypeLblStrict7EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5035;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitNameTypeLblStrict7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ParallelQueuedUnit_3048,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrictEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrictEditPart.java
new file mode 100644
index 0000000..bb4d23a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitNameTypeLblStrictEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitNameTypeLblStrictEditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5081;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitNameTypeLblStrictEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.ParallelQueuedUnit_2003,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.java
new file mode 100644
index 0000000..5efeda8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7023;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.java
new file mode 100644
index 0000000..a543929
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7025;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.java
new file mode 100644
index 0000000..9c7c83c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7029;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.java
new file mode 100644
index 0000000..204a3f5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7033;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.java
new file mode 100644
index 0000000..2a04cfb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7041;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.java
new file mode 100644
index 0000000..150c39a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7075;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.java
new file mode 100644
index 0000000..941cae0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7005;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.java
new file mode 100644
index 0000000..5edc671
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7024;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.java
new file mode 100644
index 0000000..c6394e0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7026;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.java
new file mode 100644
index 0000000..59585ed
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7030;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.java
new file mode 100644
index 0000000..c4c0c56
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7034;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.java
new file mode 100644
index 0000000..76ca938
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7042;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.java
new file mode 100644
index 0000000..4dddf73
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7076;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.java
new file mode 100644
index 0000000..7a957ce
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7006;

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit2EditPart.java
new file mode 100644
index 0000000..71e55f2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit2EditPart.java
@@ -0,0 +1,439 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.SequentialUnitEditPart.SequentialUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3026;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SequentialUnitFigure figure = new SequentialUnitFigure();

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, false);

+		return primaryShape = figure;

+		//		return primaryShape = new SequentialUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitFigure getPrimaryShape() {

+		return (SequentialUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict2EditPart) {

+			((SequentialUnitNameTypeLblStrict2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSequentialUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SequentialUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SequentialUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSequentialUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SequentialUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSequentialUnitLabelFigure = new WrappingLabel();

+			fFigureSequentialUnitLabelFigure.setText("SequentialUnit");

+			fFigureSequentialUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSequentialUnitLabelFigure);

+

+			fSequentialUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitHelperUnitsCompartmentFigure);

+

+			fSequentialUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitRefactoringUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSequentialUnitLabelFigure() {

+			return fFigureSequentialUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitHelperUnitsCompartmentFigure() {

+			return fSequentialUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitRefactoringUnitsCompartmentFigure() {

+			return fSequentialUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit3EditPart.java
new file mode 100644
index 0000000..44645ed
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit3EditPart.java
@@ -0,0 +1,439 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart.SequentialUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3044;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SequentialUnitFigure figure = new SequentialUnitFigure();

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, false);

+		return primaryShape = figure;

+		//		return primaryShape = new SequentialUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitFigure getPrimaryShape() {

+		return (SequentialUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict3EditPart) {

+			((SequentialUnitNameTypeLblStrict3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSequentialUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SequentialUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SequentialUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSequentialUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SequentialUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSequentialUnitLabelFigure = new WrappingLabel();

+			fFigureSequentialUnitLabelFigure.setText("SequentialUnit");

+			fFigureSequentialUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSequentialUnitLabelFigure);

+

+			fSequentialUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitHelperUnitsCompartmentFigure);

+

+			fSequentialUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitRefactoringUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSequentialUnitLabelFigure() {

+			return fFigureSequentialUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitHelperUnitsCompartmentFigure() {

+			return fSequentialUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitRefactoringUnitsCompartmentFigure() {

+			return fSequentialUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit4EditPart.java
new file mode 100644
index 0000000..28c4786
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit4EditPart.java
@@ -0,0 +1,439 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart.SequentialUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3060;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SequentialUnitFigure figure = new SequentialUnitFigure();

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, false);

+		return primaryShape = figure;

+		//		return primaryShape = new SequentialUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitFigure getPrimaryShape() {

+		return (SequentialUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict4EditPart) {

+			((SequentialUnitNameTypeLblStrict4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSequentialUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SequentialUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SequentialUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSequentialUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SequentialUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSequentialUnitLabelFigure = new WrappingLabel();

+			fFigureSequentialUnitLabelFigure.setText("SequentialUnit");

+			fFigureSequentialUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSequentialUnitLabelFigure);

+

+			fSequentialUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitHelperUnitsCompartmentFigure);

+

+			fSequentialUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitRefactoringUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSequentialUnitLabelFigure() {

+			return fFigureSequentialUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitHelperUnitsCompartmentFigure() {

+			return fSequentialUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitRefactoringUnitsCompartmentFigure() {

+			return fSequentialUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit5EditPart.java
new file mode 100644
index 0000000..78ce982
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit5EditPart.java
@@ -0,0 +1,439 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart.SequentialUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3069;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SequentialUnitFigure figure = new SequentialUnitFigure();

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, false);

+		return primaryShape = figure;

+		//		return primaryShape = new SequentialUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitFigure getPrimaryShape() {

+		return (SequentialUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict5EditPart) {

+			((SequentialUnitNameTypeLblStrict5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSequentialUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SequentialUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SequentialUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSequentialUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SequentialUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSequentialUnitLabelFigure = new WrappingLabel();

+			fFigureSequentialUnitLabelFigure.setText("SequentialUnit");

+			fFigureSequentialUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSequentialUnitLabelFigure);

+

+			fSequentialUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitHelperUnitsCompartmentFigure);

+

+			fSequentialUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitRefactoringUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSequentialUnitLabelFigure() {

+			return fFigureSequentialUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitHelperUnitsCompartmentFigure() {

+			return fSequentialUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitRefactoringUnitsCompartmentFigure() {

+			return fSequentialUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit6EditPart.java
new file mode 100644
index 0000000..c4a7bd2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit6EditPart.java
@@ -0,0 +1,439 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart.SequentialUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit6ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit6EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3070;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnit6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnit6CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SequentialUnitFigure figure = new SequentialUnitFigure();

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, false);

+		return primaryShape = figure;

+		//		return primaryShape = new SequentialUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitFigure getPrimaryShape() {

+		return (SequentialUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict6EditPart) {

+			((SequentialUnitNameTypeLblStrict6EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSequentialUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict6EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SequentialUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SequentialUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSequentialUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SequentialUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSequentialUnitLabelFigure = new WrappingLabel();

+			fFigureSequentialUnitLabelFigure.setText("SequentialUnit");

+			fFigureSequentialUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSequentialUnitLabelFigure);

+

+			fSequentialUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitHelperUnitsCompartmentFigure);

+

+			fSequentialUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitRefactoringUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSequentialUnitLabelFigure() {

+			return fFigureSequentialUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitHelperUnitsCompartmentFigure() {

+			return fSequentialUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitRefactoringUnitsCompartmentFigure() {

+			return fSequentialUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit7EditPart.java
new file mode 100644
index 0000000..4b046f0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnit7EditPart.java
@@ -0,0 +1,438 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnit7ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit7EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3073;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnit7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnit7CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SequentialUnitFigure figure = new SequentialUnitFigure();

+		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		unit.setFigure(figure);

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, false);

+		return primaryShape = figure;

+		//		return primaryShape = new SequentialUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitFigure getPrimaryShape() {

+		return (SequentialUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict7EditPart) {

+			((SequentialUnitNameTypeLblStrict7EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSequentialUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrict7EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SequentialUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SequentialUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSequentialUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SequentialUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSequentialUnitLabelFigure = new WrappingLabel();

+			fFigureSequentialUnitLabelFigure.setText("SequentialUnit");

+			fFigureSequentialUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSequentialUnitLabelFigure);

+

+			fSequentialUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitHelperUnitsCompartmentFigure);

+

+			fSequentialUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitRefactoringUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSequentialUnitLabelFigure() {

+			return fFigureSequentialUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitHelperUnitsCompartmentFigure() {

+			return fSequentialUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitRefactoringUnitsCompartmentFigure() {

+			return fSequentialUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitEditPart.java
new file mode 100644
index 0000000..25b0780
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitEditPart.java
@@ -0,0 +1,453 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EcorePackage;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2005;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SequentialUnitFigure figure = new SequentialUnitFigure();

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, false);

+		return primaryShape = figure;

+		//		return primaryShape = new SequentialUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitFigure getPrimaryShape() {

+		return (SequentialUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrictEditPart) {

+			((SequentialUnitNameTypeLblStrictEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSequentialUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort8EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SequentialUnitNameTypeLblStrictEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort7EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort8EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort8EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart) {

+			return getPrimaryShape()

+					.getSequentialUnitRefactoringUnitsCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SequentialUnitNameTypeLblStrictEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		if (event.getNotifier() == getModel()

+				&& EcorePackage.eINSTANCE.getEModelElement_EAnnotations()

+						.equals(event.getFeature())) {

+			handleMajorSemanticChange();

+		} else {

+			super.handleNotificationEvent(event);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SequentialUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSequentialUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSequentialUnitRefactoringUnitsCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SequentialUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSequentialUnitLabelFigure = new WrappingLabel();

+			fFigureSequentialUnitLabelFigure.setText("SequentialUnit");

+			fFigureSequentialUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSequentialUnitLabelFigure);

+

+			fSequentialUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitHelperUnitsCompartmentFigure);

+

+			fSequentialUnitRefactoringUnitsCompartmentFigure = new RectangleFigure();

+			fSequentialUnitRefactoringUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSequentialUnitRefactoringUnitsCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSequentialUnitLabelFigure() {

+			return fFigureSequentialUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitHelperUnitsCompartmentFigure() {

+			return fSequentialUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSequentialUnitRefactoringUnitsCompartmentFigure() {

+			return fSequentialUnitRefactoringUnitsCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict2EditPart.java
new file mode 100644
index 0000000..c8def06
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SequentialUnitNameTypeLblStrict2EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5074;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitNameTypeLblStrict2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SequentialUnit_3026,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict3EditPart.java
new file mode 100644
index 0000000..daebfcd
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SequentialUnitNameTypeLblStrict3EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5067;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitNameTypeLblStrict3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SequentialUnit_3044,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict4EditPart.java
new file mode 100644
index 0000000..8fb1e59
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SequentialUnitNameTypeLblStrict4EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5062;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitNameTypeLblStrict4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SequentialUnit_3060,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict5EditPart.java
new file mode 100644
index 0000000..9d5b659
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SequentialUnitNameTypeLblStrict5EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5059;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitNameTypeLblStrict5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SequentialUnit_3069,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict6EditPart.java
new file mode 100644
index 0000000..aefb2bf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict6EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SequentialUnitNameTypeLblStrict6EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5058;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitNameTypeLblStrict6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SequentialUnit_3070,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict7EditPart.java
new file mode 100644
index 0000000..082a7d2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrict7EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SequentialUnitNameTypeLblStrict7EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5051;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitNameTypeLblStrict7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SequentialUnit_3073,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrictEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrictEditPart.java
new file mode 100644
index 0000000..7b430f7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitNameTypeLblStrictEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SequentialUnitNameTypeLblStrictEditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5083;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitNameTypeLblStrictEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SequentialUnit_2005,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.java
new file mode 100644
index 0000000..675748a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7031;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.java
new file mode 100644
index 0000000..b0985da
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7047;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.java
new file mode 100644
index 0000000..650b66a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7057;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.java
new file mode 100644
index 0000000..144ddae
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7059;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.java
new file mode 100644
index 0000000..3da8297
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7069;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.java
new file mode 100644
index 0000000..7908e64
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7079;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.java
new file mode 100644
index 0000000..a8e0bb5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitHelperUnitsCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart extends

+		ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7013;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitHelperUnitsCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.java
new file mode 100644
index 0000000..65681c4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7032;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.java
new file mode 100644
index 0000000..c547a02
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7048;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.java
new file mode 100644
index 0000000..e629cd6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7058;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.java
new file mode 100644
index 0000000..d266466
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7060;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.java
new file mode 100644
index 0000000..db81165
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7070;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.java
new file mode 100644
index 0000000..85550c2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7080;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.java
new file mode 100644
index 0000000..e612204
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SequentialUnitSequentialUnitRefactoringUnitsCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7014;

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SequentialUnitSequentialUnitRefactoringUnitsCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit2EditPart.java
new file mode 100644
index 0000000..ec74784
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit2EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFeatureUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFeatureUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3038;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFeatureUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFeatureUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort4EditPart.VISUAL_ID:

+				case MultiInputPort3EditPart.VISUAL_ID:

+				case SingleOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitFigure getPrimaryShape() {

+		return (SingleFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType2EditPart) {

+			((SingleFeatureUnitNameType2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnitNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFeatureUnitLabelFigure.setText("SingleFeatureUnit");

+

+			this.add(fFigureSingleFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFeatureUnitLabelFigure() {

+			return fFigureSingleFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit3EditPart.java
new file mode 100644
index 0000000..e114f37
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit3EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFeatureUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFeatureUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3050;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFeatureUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFeatureUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort4EditPart.VISUAL_ID:

+				case MultiInputPort3EditPart.VISUAL_ID:

+				case SingleOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitFigure getPrimaryShape() {

+		return (SingleFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType3EditPart) {

+			((SingleFeatureUnitNameType3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnitNameType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFeatureUnitLabelFigure.setText("SingleFeatureUnit");

+

+			this.add(fFigureSingleFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFeatureUnitLabelFigure() {

+			return fFigureSingleFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit4EditPart.java
new file mode 100644
index 0000000..c5932be
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit4EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFeatureUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFeatureUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3055;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFeatureUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFeatureUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort4EditPart.VISUAL_ID:

+				case MultiInputPort3EditPart.VISUAL_ID:

+				case SingleOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitFigure getPrimaryShape() {

+		return (SingleFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType4EditPart) {

+			((SingleFeatureUnitNameType4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnitNameType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFeatureUnitLabelFigure.setText("SingleFeatureUnit");

+

+			this.add(fFigureSingleFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFeatureUnitLabelFigure() {

+			return fFigureSingleFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit5EditPart.java
new file mode 100644
index 0000000..a08681f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnit5EditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFeatureUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFeatureUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3061;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFeatureUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFeatureUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort4EditPart.VISUAL_ID:

+				case MultiInputPort3EditPart.VISUAL_ID:

+				case SingleOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitFigure getPrimaryShape() {

+		return (SingleFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType5EditPart) {

+			((SingleFeatureUnitNameType5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameType5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnitNameType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFeatureUnitLabelFigure.setText("SingleFeatureUnit");

+

+			this.add(fFigureSingleFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFeatureUnitLabelFigure() {

+			return fFigureSingleFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitEditPart.java
new file mode 100644
index 0000000..5f8273d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitEditPart.java
@@ -0,0 +1,366 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFeatureUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFeatureUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3008;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFeatureUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFeatureUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort4EditPart.VISUAL_ID:

+				case MultiInputPort3EditPart.VISUAL_ID:

+				case SingleOutputPortEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFeatureUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitFigure getPrimaryShape() {

+		return (SingleFeatureUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameTypeEditPart) {

+			((SingleFeatureUnitNameTypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFeatureUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort4EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort3EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPortEditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFeatureUnitNameTypeEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort4EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleInputPort4EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort3EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((MultiInputPort3EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPortEditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPortEditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnitNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFeatureUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFeatureUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFeatureUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFeatureUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFeatureUnitLabelFigure.setText("SingleFeatureUnit");

+

+			this.add(fFigureSingleFeatureUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFeatureUnitLabelFigure() {

+			return fFigureSingleFeatureUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType2EditPart.java
new file mode 100644
index 0000000..3de5f87
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitNameType2EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5029;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFeatureUnit_3038,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFeatureUnitNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType3EditPart.java
new file mode 100644
index 0000000..bdd24e1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitNameType3EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5036;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitNameType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFeatureUnit_3050,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFeatureUnitNameType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType4EditPart.java
new file mode 100644
index 0000000..1628cbe
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitNameType4EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5040;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitNameType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFeatureUnit_3055,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFeatureUnitNameType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType5EditPart.java
new file mode 100644
index 0000000..bbff7ec
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameType5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitNameType5EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5044;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitNameType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFeatureUnit_3061,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFeatureUnitNameType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameTypeEditPart.java
new file mode 100644
index 0000000..a4a344e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFeatureUnitNameTypeEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitNameTypeEditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5009;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFeatureUnit_3008,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFeatureUnitNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit2EditPart.java
new file mode 100644
index 0000000..bd23d69
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit2EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFilterUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFilterUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3040;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFilterUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFilterUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort5EditPart.VISUAL_ID:

+				case SingleOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitFigure getPrimaryShape() {

+		return (SingleFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType2EditPart) {

+			((SingleFilterUnitNameType2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFilterUnitNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFilterUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFilterUnitLabelFigure.setText("SingleFilterUnit");

+

+			this.add(fFigureSingleFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFilterUnitLabelFigure() {

+			return fFigureSingleFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit3EditPart.java
new file mode 100644
index 0000000..2c5aaa3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit3EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFilterUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFilterUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3052;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFilterUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFilterUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort5EditPart.VISUAL_ID:

+				case SingleOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitFigure getPrimaryShape() {

+		return (SingleFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType3EditPart) {

+			((SingleFilterUnitNameType3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFilterUnitNameType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFilterUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFilterUnitLabelFigure.setText("SingleFilterUnit");

+

+			this.add(fFigureSingleFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFilterUnitLabelFigure() {

+			return fFigureSingleFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit4EditPart.java
new file mode 100644
index 0000000..4b4b390
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit4EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFilterUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFilterUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3057;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFilterUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFilterUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort5EditPart.VISUAL_ID:

+				case SingleOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitFigure getPrimaryShape() {

+		return (SingleFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType4EditPart) {

+			((SingleFilterUnitNameType4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOt

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFilterUnitNameType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFilterUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFilterUnitLabelFigure.setText("SingleFilterUnit");

+

+			this.add(fFigureSingleFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFilterUnitLabelFigure() {

+			return fFigureSingleFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit5EditPart.java
new file mode 100644
index 0000000..f24a431
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnit5EditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFilterUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFilterUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3063;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFilterUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFilterUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort5EditPart.VISUAL_ID:

+				case SingleOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitFigure getPrimaryShape() {

+		return (SingleFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType5EditPart) {

+			((SingleFilterUnitNameType5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameType5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFilterUnitNameType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFilterUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFilterUnitLabelFigure.setText("SingleFilterUnit");

+

+			this.add(fFigureSingleFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFilterUnitLabelFigure() {

+			return fFigureSingleFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitEditPart.java
new file mode 100644
index 0000000..8ff5c12
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitEditPart.java
@@ -0,0 +1,350 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.policies.SingleFilterUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleFilterUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3016;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleFilterUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleFilterUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case MultiInputPort5EditPart.VISUAL_ID:

+				case SingleOutputPort2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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() {

+		return primaryShape = new SingleFilterUnitFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitFigure getPrimaryShape() {

+		return (SingleFilterUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameTypeEditPart) {

+			((SingleFilterUnitNameTypeEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleFilterUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort5EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setCurrentSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.SOUTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleOutputPort2EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleFilterUnitNameTypeEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort5EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort5EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleOutputPort2EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((SingleOutputPort2EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleFilterUnitNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleFilterUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleFilterUnitLabelFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleFilterUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleFilterUnitLabelFigure = new WrappingLabel();

+			fFigureSingleFilterUnitLabelFigure.setText("SingleFilterUnit");

+

+			this.add(fFigureSingleFilterUnitLabelFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleFilterUnitLabelFigure() {

+			return fFigureSingleFilterUnitLabelFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType2EditPart.java
new file mode 100644
index 0000000..6c67a33
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitNameType2EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5031;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFilterUnit_3040,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFilterUnitNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType3EditPart.java
new file mode 100644
index 0000000..7c21250
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitNameType3EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5038;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitNameType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFilterUnit_3052,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFilterUnitNameType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType4EditPart.java
new file mode 100644
index 0000000..294480a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitNameType4EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5042;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitNameType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFilterUnit_3057,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFilterUnitNameType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType5EditPart.java
new file mode 100644
index 0000000..35e1f3a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameType5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitNameType5EditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5046;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitNameType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFilterUnit_3063,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFilterUnitNameType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameTypeEditPart.java
new file mode 100644
index 0000000..3a08fe9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleFilterUnitNameTypeEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitNameTypeEditPart extends CompartmentEditPart

+		implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5016;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleFilterUnit_3016,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleFilterUnitNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort2EditPart.java
new file mode 100644
index 0000000..1088cc1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort2EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort2EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3001;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort3EditPart.java
new file mode 100644
index 0000000..7a91e6b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort3EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort3EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3005;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType3EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType3EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort4EditPart.java
new file mode 100644
index 0000000..4b92dd5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort4EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort4EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3009;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType4EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType4EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort5EditPart.java
new file mode 100644
index 0000000..1b3ccdc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort5EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort5EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3013;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType5EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType5EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort6EditPart.java
new file mode 100644
index 0000000..16ade48
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort6EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort6ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort6EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3023;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType6EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort7EditPart.java
new file mode 100644
index 0000000..c45e59f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort7EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort7ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort7EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3027;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort8EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort8EditPart.java
new file mode 100644
index 0000000..be653a5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort8EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort8ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort8EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3031;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort8EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort8ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType8EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType8EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType8EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort9EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort9EditPart.java
new file mode 100644
index 0000000..68878e5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPort9EditPart.java
@@ -0,0 +1,394 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.parts.SingleInputPortEditPart.SingleInputPortFigure;

+import comrel.diagram.edit.policies.SingleInputPort9ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPort9EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3035;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort9EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPort9ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameType9EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameType9EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameType9EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortEditPart.java
new file mode 100644
index 0000000..b68f865
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortEditPart.java
@@ -0,0 +1,403 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EcorePackage;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.InputPort;

+import comrel.diagram.edit.policies.SingleInputPortItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.InputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleInputPortEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2001;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleInputPortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPortNameTypeEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleInputPortFigure figure = new SingleInputPortFigure();

+		InputPort port = (InputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortFigure getPrimaryShape() {

+		return (SingleInputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleInputPortNameTypeEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleInputPortNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof comrel.diagram.edit.parts.SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		types.add(ComrelElementTypes.MultiSinglePortMapping_4003);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		} else if (relationshipType == ComrelElementTypes.MultiSinglePortMapping_4003) {

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		if (event.getNotifier() == getModel()

+				&& EcorePackage.eINSTANCE.getEModelElement_EAnnotations()

+						.equals(event.getFeature())) {

+			handleMajorSemanticChange();

+		} else {

+			super.handleNotificationEvent(event);

+		}

+	}

+

+	//	/**

+	//	 * @generated

+	//	 */

+	//	public class SingleInputPortFigure extends RectangleFigure {

+	//

+	//		/**

+	//		 * @generated

+	//		 */

+	//		public SingleInputPortFigure() {

+	//			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+	//					getMapMode().DPtoLP(20)));

+	//			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+	//					getMapMode().DPtoLP(5)));

+	//		}

+	//

+	//	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleInputPortFigure extends InputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType2EditPart.java
new file mode 100644
index 0000000..0fea0f1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType2EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType2EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5002;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType2EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3001,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType3EditPart.java
new file mode 100644
index 0000000..d188be9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType3EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType3EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5004;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType3EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3005,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType4EditPart.java
new file mode 100644
index 0000000..774b0a4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType4EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType4EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5006;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType4EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3009,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType5EditPart.java
new file mode 100644
index 0000000..0387113
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType5EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType5EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5010;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType5EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3013,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType6EditPart.java
new file mode 100644
index 0000000..7eb00d4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType6EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType6EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5020;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType6EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3023,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType7EditPart.java
new file mode 100644
index 0000000..067f8ad
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType7EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType7EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5022;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType7EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3027,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType8EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType8EditPart.java
new file mode 100644
index 0000000..42ed0cb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType8EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType8EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5024;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType8EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType8EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3031,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType8EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType9EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType9EditPart.java
new file mode 100644
index 0000000..2a2a5e3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameType9EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameType9EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5026;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameType9EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameType9EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_3035,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameType9EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameTypeEditPart.java
new file mode 100644
index 0000000..f92473b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleInputPortNameTypeEditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleInputPortNameTypeEditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5001;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleInputPortNameTypeEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleInputPort_2001,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleInputPortNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleInputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleInputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleInputPortLabelFigure() {

+			this.setText("SingleInputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPort2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPort2EditPart.java
new file mode 100644
index 0000000..1b3f21b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPort2EditPart.java
@@ -0,0 +1,332 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.Ellipse;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.OutputPort;

+import comrel.diagram.edit.policies.SingleOutputPort2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.OutputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleOutputPort2EditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3018;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPort2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleOutputPort2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleOutputPortNameType2EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleOutputPortFigure figure = new SingleOutputPortFigure();

+		OutputPort port = (OutputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPortFigure getPrimaryShape() {

+		return (SingleOutputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleOutputPortNameType2EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleOutputPortNameType2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleOutputPortFigure extends OutputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleOutputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortEditPart.java
new file mode 100644
index 0000000..e56b5f7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortEditPart.java
@@ -0,0 +1,332 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.Ellipse;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.OutputPort;

+import comrel.diagram.edit.policies.SingleOutputPortItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.figures.OutputPortFigure;

+

+/**

+ * @generated

+ */

+public class SingleOutputPortEditPart extends BorderedBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3011;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPortEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleOutputPortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleOutputPortNameTypeEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List createSelectionHandles() {

+							MoveHandle mh = new MoveHandle(

+									(GraphicalEditPart) getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleOutputPortFigure figure = new SingleOutputPortFigure();

+		OutputPort port = (OutputPort) this.resolveSemanticElement();

+		figure.setPort(port);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPortFigure getPrimaryShape() {

+		return (SingleOutputPortFigure) primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer,

+			IBorderItemEditPart borderItemEditPart) {

+		if (borderItemEditPart instanceof SingleOutputPortNameTypeEditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.SOUTH);

+			locator.setBorderItemOffset(new Dimension(-20, -20));

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+

+		//FIXME: workaround for #154536

+		result.getBounds().setSize(result.getPreferredSize());

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleOutputPortNameTypeEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(ComrelElementTypes.SinglePortMapping_4001);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(

+			IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			types.add(ComrelElementTypes.SinglePortMapping_4001);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if (relationshipType == ComrelElementTypes.SinglePortMapping_4001) {

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SingleOutputPortFigure extends OutputPortFigure {

+

+		/**

+		 * @generated

+		 */

+		public SingleOutputPortFigure() {

+			this.setPreferredSize(new Dimension(getMapMode().DPtoLP(20),

+					getMapMode().DPtoLP(20)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortNameType2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortNameType2EditPart.java
new file mode 100644
index 0000000..2f91209
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortNameType2EditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleOutputPortNameType2EditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5015;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleOutputPortNameType2EditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPortNameType2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleOutputPort_3018,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleOutputPortNameType2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleOutputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleOutputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleOutputPortLabelFigure() {

+			this.setText("SingleOutputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortNameTypeEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortNameTypeEditPart.java
new file mode 100644
index 0000000..8eb5a41
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleOutputPortNameTypeEditPart.java
@@ -0,0 +1,631 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.diagram.ui.editparts.IBorderItemEditPart;

+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.figures.IBorderItemLocator;

+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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleOutputPortNameTypeEditPart extends LabelEditPart implements

+		ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5008;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(

+				ComrelVisualIDRegistry

+						.getType(comrel.diagram.edit.parts.SingleOutputPortNameTypeEditPart.VISUAL_ID),

+				new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPortNameTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(

+					getFigure());

+			return (IBorderItemLocator) constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_X())).intValue();

+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getLocation_Y())).intValue();

+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Width())).intValue();

+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE

+				.getSize_Height())).intValue();

+		getBorderItemLocator()

+				.setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		int posDot = -1;

+		int posDouble = -1;

+		posDot = text.lastIndexOf(".");

+		posDouble = text.indexOf(":");

+		if (posDot > -1 && posDouble > -1) {

+			String first = text.substring(0, posDouble + 1);

+			String second = text.substring(posDot + 1);

+			text = first + second;

+		}

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleOutputPort_3011,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleOutputPortNameTypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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 SingleOutputPortLabelFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleOutputPortLabelFigure extends WrappingLabel {

+

+		/**

+		 * @generated

+		 */

+		public SingleOutputPortLabelFigure() {

+			this.setText("SingleOutputPort");

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SinglePortMappingEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SinglePortMappingEditPart.java
new file mode 100644
index 0000000..df7a1a0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SinglePortMappingEditPart.java
@@ -0,0 +1,98 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.PolylineDecoration;

+import org.eclipse.draw2d.RotatableDecoration;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.PortMapping;

+import comrel.SinglePortMapping;

+import comrel.diagram.edit.policies.SinglePortMappingItemSemanticEditPolicy;

+import comrel.figures.PortMappingFigure;

+

+/**

+ * @generated

+ */

+public class SinglePortMappingEditPart extends ConnectionNodeEditPart implements

+		ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4001;

+

+	/**

+	 * @generated

+	 */

+	public SinglePortMappingEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SinglePortMappingItemSemanticEditPolicy());

+	}

+

+	/**

+	 * 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 NOT

+	 */

+

+	protected Connection createConnectionFigure() {

+		PortMapping mapping = (PortMapping) this.resolveSemanticElement();

+		SinglePortMappingFigure figure = new SinglePortMappingFigure();

+		figure.setMapping(mapping);

+		return figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SinglePortMappingFigure getPrimaryShape() {

+		return (SinglePortMappingFigure) getFigure();

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public class SinglePortMappingFigure extends PortMappingFigure {

+

+		SinglePortMapping mapping;

+

+		/**

+		 * @generated

+		 */

+		public SinglePortMappingFigure() {

+			this.setLineWidth(2);

+			this.setLineStyle(Graphics.LINE_DOT);

+

+			setTargetDecoration(createTargetDecoration());

+		}

+

+		/**

+		 * @generated

+		 */

+		private RotatableDecoration createTargetDecoration() {

+			PolylineDecoration df = new PolylineDecoration();

+			return df;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit2EditPart.java
new file mode 100644
index 0000000..974fb47
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit2EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart.SingleQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit2ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit2EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3022;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnit2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnit2CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitFigure getPrimaryShape() {

+		return (SingleQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict2EditPart) {

+			((SingleQueuedUnitNameTypeLblStrict2EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict2EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureSingleQueuedUnitLabelFigure.setText("SingleQueuedUnit");

+			fFigureSingleQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSingleQueuedUnitLabelFigure);

+

+			fSingleQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitHelperUnitsCompartmentFigure);

+

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleQueuedUnitLabelFigure() {

+			return fFigureSingleQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitHelperUnitsCompartmentFigure() {

+			return fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit3EditPart.java
new file mode 100644
index 0000000..1b24290
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit3EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart.SingleQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit3ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit3EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3042;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnit3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnit3CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitFigure getPrimaryShape() {

+		return (SingleQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict3EditPart) {

+			((SingleQueuedUnitNameTypeLblStrict3EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict3EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureSingleQueuedUnitLabelFigure.setText("SingleQueuedUnit");

+			fFigureSingleQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSingleQueuedUnitLabelFigure);

+

+			fSingleQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitHelperUnitsCompartmentFigure);

+

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleQueuedUnitLabelFigure() {

+			return fFigureSingleQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitHelperUnitsCompartmentFigure() {

+			return fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit4EditPart.java
new file mode 100644
index 0000000..34ee0ae
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit4EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart.SingleQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit4ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit4EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3054;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnit4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnit4CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitFigure getPrimaryShape() {

+		return (SingleQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict4EditPart) {

+			((SingleQueuedUnitNameTypeLblStrict4EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict4EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureSingleQueuedUnitLabelFigure.setText("SingleQueuedUnit");

+			fFigureSingleQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSingleQueuedUnitLabelFigure);

+

+			fSingleQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitHelperUnitsCompartmentFigure);

+

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleQueuedUnitLabelFigure() {

+			return fFigureSingleQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitHelperUnitsCompartmentFigure() {

+			return fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit5EditPart.java
new file mode 100644
index 0000000..97f7c8f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit5EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart.SingleQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit5ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit5EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3059;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnit5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnit5CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitFigure getPrimaryShape() {

+		return (SingleQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict5EditPart) {

+			((SingleQueuedUnitNameTypeLblStrict5EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict5EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureSingleQueuedUnitLabelFigure.setText("SingleQueuedUnit");

+			fFigureSingleQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSingleQueuedUnitLabelFigure);

+

+			fSingleQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitHelperUnitsCompartmentFigure);

+

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleQueuedUnitLabelFigure() {

+			return fFigureSingleQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitHelperUnitsCompartmentFigure() {

+			return fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit6EditPart.java
new file mode 100644
index 0000000..83b7266
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit6EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart.SingleQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit6ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit6EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3065;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnit6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnit6CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitFigure getPrimaryShape() {

+		return (SingleQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict6EditPart) {

+			((SingleQueuedUnitNameTypeLblStrict6EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict6EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureSingleQueuedUnitLabelFigure.setText("SingleQueuedUnit");

+			fFigureSingleQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSingleQueuedUnitLabelFigure);

+

+			fSingleQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitHelperUnitsCompartmentFigure);

+

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleQueuedUnitLabelFigure() {

+			return fFigureSingleQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitHelperUnitsCompartmentFigure() {

+			return fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit7EditPart.java
new file mode 100644
index 0000000..9684e87
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnit7EditPart.java
@@ -0,0 +1,437 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.RefactoringUnit;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnit7ItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit7EditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3067;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnit7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnit7CanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitFigure getPrimaryShape() {

+		return (SingleQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict7EditPart) {

+			((SingleQueuedUnitNameTypeLblStrict7EditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrict7EditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureSingleQueuedUnitLabelFigure.setText("SingleQueuedUnit");

+			fFigureSingleQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSingleQueuedUnitLabelFigure);

+

+			fSingleQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitHelperUnitsCompartmentFigure);

+

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleQueuedUnitLabelFigure() {

+			return fFigureSingleQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitHelperUnitsCompartmentFigure() {

+			return fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitEditPart.java
new file mode 100644
index 0000000..5e98ffe
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitEditPart.java
@@ -0,0 +1,452 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.RoundedRectangle;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EcorePackage;

+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.AbstractBorderedShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+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.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Color;

+

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart.SingleQueuedUnitFigure;

+import comrel.diagram.edit.parts.custom.Labels;

+import comrel.diagram.edit.policies.OpenDiagramEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitItemSemanticEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitEditPart extends AbstractBorderedShapeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2004;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.OPEN_ROLE,

+				new OpenDiagramEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View) child.getModel();

+				switch (ComrelVisualIDRegistry.getVisualID(childView)) {

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy();

+				}

+				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 NOT

+	 */

+	protected IFigure createNodeShape() {

+		SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+		RectangleFigure compHelper = (RectangleFigure) figure.getChildren()

+				.get(1);

+		RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+		Labels.setLabels(compHelper, compRef, true);

+		//		RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+		//		unit.setFigure(figure);

+		return primaryShape = figure;

+	}

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitFigure getPrimaryShape() {

+		return (SingleQueuedUnitFigure) primaryShape;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrictEditPart) {

+			((SingleQueuedUnitNameTypeLblStrictEditPart) childEditPart)

+					.setLabel(getPrimaryShape()

+							.getFigureSingleQueuedUnitLabelFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((SingleInputPort6EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			BorderItemLocator locator = new BorderItemLocator(getMainFigure(),

+					PositionConstants.NORTH);

+			locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+			locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+			getBorderedFigure().getBorderItemContainer().add(

+					((MultiInputPort7EditPart) childEditPart).getFigure(),

+					locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if (childEditPart instanceof SingleQueuedUnitNameTypeLblStrictEditPart) {

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart) {

+			IFigure pane = getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.remove(((SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart) childEditPart)

+					.getFigure());

+			return true;

+		}

+		if (childEditPart instanceof SingleInputPort6EditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(

+					((SingleInputPort6EditPart) childEditPart).getFigure());

+			return true;

+		}

+		if (childEditPart instanceof MultiInputPort7EditPart) {

+			//			getBorderedFigure().getBorderItemContainer().remove(

+			//					((MultiInputPort7EditPart) childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @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

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitHelperUnitsCompartmentFigure();

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart) {

+			return getPrimaryShape()

+					.getSingleQueuedUnitRefactoringUnitCompartmentFigure();

+		}

+		if (editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * 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 createMainFigure() {

+		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(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if (contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setBackgroundColor(Color color) {

+		if (primaryShape != null) {

+			primaryShape.setBackgroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if (primaryShape instanceof Shape) {

+			((Shape) primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		if (event.getNotifier() == getModel()

+				&& EcorePackage.eINSTANCE.getEModelElement_EAnnotations()

+						.equals(event.getFeature())) {

+			handleMajorSemanticChange();

+		} else {

+			super.handleNotificationEvent(event);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public class SingleQueuedUnitFigure extends RoundedRectangle {

+

+		/**

+		 * @generated

+		 */

+		private WrappingLabel fFigureSingleQueuedUnitLabelFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		/**

+		 * @generated

+		 */

+		private RectangleFigure fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+

+		/**

+		 * @generated

+		 */

+		public SingleQueuedUnitFigure() {

+			this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8),

+					getMapMode().DPtoLP(8)));

+			this.setBorder(new MarginBorder(getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),

+					getMapMode().DPtoLP(5)));

+			createContents();

+		}

+

+		/**

+		 * @generated

+		 */

+		private void createContents() {

+

+			fFigureSingleQueuedUnitLabelFigure = new WrappingLabel();

+			fFigureSingleQueuedUnitLabelFigure.setText("SingleQueuedUnit");

+			fFigureSingleQueuedUnitLabelFigure.setMaximumSize(new Dimension(

+					getMapMode().DPtoLP(10000), getMapMode().DPtoLP(50)));

+

+			this.add(fFigureSingleQueuedUnitLabelFigure);

+

+			fSingleQueuedUnitHelperUnitsCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitHelperUnitsCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitHelperUnitsCompartmentFigure);

+

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure = new RectangleFigure();

+			fSingleQueuedUnitRefactoringUnitCompartmentFigure.setOutline(false);

+

+			this.add(fSingleQueuedUnitRefactoringUnitCompartmentFigure);

+

+		}

+

+		/**

+		 * @generated

+		 */

+		public WrappingLabel getFigureSingleQueuedUnitLabelFigure() {

+			return fFigureSingleQueuedUnitLabelFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitHelperUnitsCompartmentFigure() {

+			return fSingleQueuedUnitHelperUnitsCompartmentFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public RectangleFigure getSingleQueuedUnitRefactoringUnitCompartmentFigure() {

+			return fSingleQueuedUnitRefactoringUnitCompartmentFigure;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict2EditPart.java
new file mode 100644
index 0000000..00d46a1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict2EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitNameTypeLblStrict2EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5076;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitNameTypeLblStrict2EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleQueuedUnit_3022,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict3EditPart.java
new file mode 100644
index 0000000..5278048
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict3EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitNameTypeLblStrict3EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5069;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitNameTypeLblStrict3EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleQueuedUnit_3042,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict4EditPart.java
new file mode 100644
index 0000000..d5bfe9d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict4EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitNameTypeLblStrict4EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5064;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitNameTypeLblStrict4EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleQueuedUnit_3054,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict5EditPart.java
new file mode 100644
index 0000000..b5942f2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict5EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitNameTypeLblStrict5EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5063;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitNameTypeLblStrict5EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleQueuedUnit_3059,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict6EditPart.java
new file mode 100644
index 0000000..d394f93
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict6EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitNameTypeLblStrict6EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5061;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitNameTypeLblStrict6EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleQueuedUnit_3065,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict7EditPart.java
new file mode 100644
index 0000000..77e2a41
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrict7EditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitNameTypeLblStrict7EditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5049;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitNameTypeLblStrict7EditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleQueuedUnit_3067,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrictEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrictEditPart.java
new file mode 100644
index 0000000..80e6a96
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitNameTypeLblStrictEditPart.java
@@ -0,0 +1,576 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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.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.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+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;

+

+import comrel.diagram.edit.policies.ComrelTextSelectionEditPolicy;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitNameTypeLblStrictEditPart extends

+		CompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5082;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitNameTypeLblStrictEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,

+				new ComrelTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,

+				new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new CompositeRefactoringEditPart.NodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getText();

+		} else {

+			return ((Label) figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setText(text);

+		} else {

+			((Label) figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if (figure instanceof WrappingLabel) {

+			return ((WrappingLabel) figure).getIcon();

+		} else {

+			return ((Label) figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if (figure instanceof WrappingLabel) {

+			((WrappingLabel) figure).setIcon(icon);

+		} else {

+			((Label) figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if (parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if (getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != 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<IParserEditStatus>() {

+

+											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 (getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(

+				new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if (parser == null) {

+			parser = ComrelParserProvider

+					.getParser(

+							ComrelElementTypes.SingleQueuedUnit_2004,

+							getParserElement(),

+							ComrelVisualIDRegistry

+									.getType(comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if (manager == null) {

+			setManager(new TextDirectEditManager(this,

+					TextDirectEditManager.getTextCellEditorClass(this),

+					ComrelEditPartFactory.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 ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if (sfEditPolicy instanceof ComrelTextSelectionEditPolicy) {

+			((ComrelTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(

+				NotationPackage.eINSTANCE.getFontStyle());

+		if (style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel) 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() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.java
new file mode 100644
index 0000000..16ceb2f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7027;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.java
new file mode 100644
index 0000000..45864b5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7043;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.java
new file mode 100644
index 0000000..f677401
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7045;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.java
new file mode 100644
index 0000000..07267bb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7049;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.java
new file mode 100644
index 0000000..9c4ffd3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7055;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.java
new file mode 100644
index 0000000..d8abf6b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7077;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.java
new file mode 100644
index 0000000..5fdfee5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7009;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.java
new file mode 100644
index 0000000..aedbcbd
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7028;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.java
new file mode 100644
index 0000000..a4bdb67
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7044;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.java
new file mode 100644
index 0000000..3e69606
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7046;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.java
new file mode 100644
index 0000000..d5a009d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7050;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.java
new file mode 100644
index 0000000..0e89c78
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7056;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.java
new file mode 100644
index 0000000..81db4d7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7078;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.java
new file mode 100644
index 0000000..ccf2747
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.java
@@ -0,0 +1,85 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy;

+import comrel.diagram.edit.policies.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart

+		extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7010;

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart(

+			View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure createFigure() {

+		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super

+				.createFigure();

+		result.setTitleVisibility(false);

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,

+				new ResizableCompartmentEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.SEMANTIC_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE,

+				new CreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,

+				new DragDropEditPolicy());

+		installEditPolicy(

+				EditPolicyRoles.CANONICAL_ROLE,

+				new SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/changes.txt b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/changes.txt
new file mode 100644
index 0000000..a74e7f6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/changes.txt
@@ -0,0 +1,43 @@
+----------------------

+createNodeShape (rest)

+----------------------

+

+MultiInputPortFigure figure = new MultiInputPortFigure();

+InputPort port = (InputPort) this.resolveSemanticElement();

+figure.setPort(port);

+return primaryShape = figure;

+

+

+----------------------

+createNodeShape (last)

+----------------------

+

+SingleQueuedUnitFigure figure = new SingleQueuedUnitFigure();

+RectangleFigure compHelper = (RectangleFigure) figure.getChildren().get(1);

+RectangleFigure compRef = (RectangleFigure) figure.getChildren().get(2);

+Labels.setLabels(compHelper, compRef, true);

+RefactoringUnit unit = (RefactoringUnit) this.resolveSemanticElement();

+unit.setFigure(figure);

+return primaryShape = figure;

+

+

+----------------

+addFixedChildren

+----------------

+

+-> bei InputPorts

+

+PositionConstants.NORTH);

+locator.setCurrentSideOfParent(PositionConstants.NORTH); // Position des Ports

+locator.setPreferredSideOfParent(PositionConstants.NORTH); // Position des Ports

+

+

+----------------

+removeFixedChild

+----------------

+

+-> bei MULTI-InputPorts

+

+komplett auskommentieren

+

+

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/custom/Labels.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/custom/Labels.java
new file mode 100644
index 0000000..eedf530
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/parts/custom/Labels.java
@@ -0,0 +1,46 @@
+package comrel.diagram.edit.parts.custom;

+

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.geometry.Dimension;

+

+/**

+ * Selbstdefinierte Labels

+ * @author Gerrit

+ *

+ */

+public class Labels {

+

+	public static Label getHelperLabel(){

+		Label l = new Label();

+		l.setText("Helper Units");

+		return l;

+	}

+	

+	public static Label getRefactoringUnitLabel(boolean singular){

+		String text = "Refactoring Unit";

+		if(!singular) {

+			text += "s";

+		}

+		Label l = new Label();

+		l.setText(text);

+		return l;

+	}

+	

+	

+	public static void setLabels(RectangleFigure compHelper, RectangleFigure compRef,boolean singular) {

+		Dimension maximumSize = new Dimension();

+		maximumSize.height = 15;

+		maximumSize.width = compHelper.getMaximumSize().width;

+

+		Label helperLabel = getHelperLabel();

+		helperLabel.setMaximumSize(maximumSize);

+		compHelper.add(helperLabel);

+		compHelper.setToolTip(getHelperLabel());

+		Label refLabel = getRefactoringUnitLabel(singular);

+		refLabel.setMaximumSize(maximumSize);

+

+		compRef.add(refLabel);

+		compRef.setToolTip(getRefactoringUnitLabel(singular));

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..72e1239
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit2CanonicalEditPolicy.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getAtomicUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3034SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return SingleInputPort9EditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3034SemanticChildren((View) getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a8fb3d6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,121 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SingleInputPort9CreateCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class AtomicUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.AtomicUnit_3034);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3035 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..285cd7e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit3CanonicalEditPolicy.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getAtomicUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3049SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return SingleInputPort9EditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3049SemanticChildren((View) getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..7f0fc18
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,121 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SingleInputPort9CreateCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class AtomicUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.AtomicUnit_3049);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3035 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..e168963
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit4CanonicalEditPolicy.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getAtomicUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3068SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return SingleInputPort9EditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3068SemanticChildren((View) getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8131f79
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,121 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SingleInputPort9CreateCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class AtomicUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.AtomicUnit_3068);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3035 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..30753e1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit5CanonicalEditPolicy.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getAtomicUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3074SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return SingleInputPort9EditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3074SemanticChildren((View) getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..6c2dc0f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,121 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SingleInputPort9CreateCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class AtomicUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.AtomicUnit_3074);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3035 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit6CanonicalEditPolicy.java
new file mode 100644
index 0000000..a5a7760
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit6CanonicalEditPolicy.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit6CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getAtomicUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3077SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return SingleInputPort9EditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3077SemanticChildren((View) getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..faf8f99
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit6ItemSemanticEditPolicy.java
@@ -0,0 +1,121 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SingleInputPort9CreateCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class AtomicUnit6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.AtomicUnit_3077);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3035 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit7CanonicalEditPolicy.java
new file mode 100644
index 0000000..f33392b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit7CanonicalEditPolicy.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnit7CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getAtomicUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3078SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return SingleInputPort9EditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_3078SemanticChildren((View) getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4778387
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnit7ItemSemanticEditPolicy.java
@@ -0,0 +1,121 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SingleInputPort9CreateCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class AtomicUnit7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnit7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.AtomicUnit_3078);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3035 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..1dd32b7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnitCanonicalEditPolicy.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class AtomicUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getAtomicUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_2007SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return SingleInputPort9EditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getAtomicUnit_2007SemanticChildren((View) getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8f01f39
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/AtomicUnitItemSemanticEditPolicy.java
@@ -0,0 +1,121 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SingleInputPort9CreateCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class AtomicUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AtomicUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.AtomicUnit_2007);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3035 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..e9011e3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit2CanonicalEditPolicy.java
@@ -0,0 +1,179 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit2CanonicalEditPolicy extends

+		CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3003SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort2EditPart.VISUAL_ID

+				|| visualID == MultiInputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3003SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..9bf8852
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort2CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3002 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..fc3415f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit3CanonicalEditPolicy.java
@@ -0,0 +1,179 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit3CanonicalEditPolicy extends

+		CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3007SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort2EditPart.VISUAL_ID

+				|| visualID == MultiInputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3007SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..45ef38b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort2CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3007);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3002 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..967ac63
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit4CanonicalEditPolicy.java
@@ -0,0 +1,179 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit4CanonicalEditPolicy extends

+		CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3025SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort2EditPart.VISUAL_ID

+				|| visualID == MultiInputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3025SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..1fc6b4e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort2CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3025);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3002 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..3709caf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit5CanonicalEditPolicy.java
@@ -0,0 +1,179 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit5CanonicalEditPolicy extends

+		CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3029SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort2EditPart.VISUAL_ID

+				|| visualID == MultiInputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3029SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..be748f7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort2CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3029);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3002 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit6CanonicalEditPolicy.java
new file mode 100644
index 0000000..910d9a4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit6CanonicalEditPolicy.java
@@ -0,0 +1,179 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit6CanonicalEditPolicy extends

+		CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3033SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort2EditPart.VISUAL_ID

+				|| visualID == MultiInputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3033SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d86d4af
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit6ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort2CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3033);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3002 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit7CanonicalEditPolicy.java
new file mode 100644
index 0000000..e09d849
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit7CanonicalEditPolicy.java
@@ -0,0 +1,179 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit7CanonicalEditPolicy extends

+		CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3047SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort2EditPart.VISUAL_ID

+				|| visualID == MultiInputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_3047SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..2d5b6e3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnit7ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort2CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnit7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnit7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3047);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3002 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..5a9d565
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCartesianQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_2002SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort2EditPart.VISUAL_ID

+				|| visualID == MultiInputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnit_2002SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..bfd28d1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7003SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+		case SingleFilterUnitEditPart.VISUAL_ID:

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7003SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b83134d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3008 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3012 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3016 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3019 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..53dbe90
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7007SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+		case SingleFilterUnitEditPart.VISUAL_ID:

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7007SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b09ffb6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3007);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3008 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3012 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3016 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3019 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..9a0cf91
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7011SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+		case SingleFilterUnitEditPart.VISUAL_ID:

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7011SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c1a5480
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3025);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3008 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3012 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3016 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3019 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..6f0c428
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7015SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+		case SingleFilterUnitEditPart.VISUAL_ID:

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7015SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b32cac5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3029);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3008 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3012 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3016 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3019 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..43031e2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7021SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+		case SingleFilterUnitEditPart.VISUAL_ID:

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7021SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..3169a37
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3033);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3008 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3012 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3016 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3019 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..3289ad3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7039SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+		case SingleFilterUnitEditPart.VISUAL_ID:

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7039SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ebf2776
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3047);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3008 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3012 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3016 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3019 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..17409fb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7001SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+		case SingleFilterUnitEditPart.VISUAL_ID:

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7001SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..1242152
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_2002);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3008 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3012 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3016 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3019 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..5b08273
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7004SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+		case SequentialUnit2EditPart.VISUAL_ID:

+		case ConditionalUnit2EditPart.VISUAL_ID:

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7004SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..206c2d9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit2CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit2CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3003 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3004 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3022 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3026 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3030 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3034 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..252cbfd
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7008SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+		case SequentialUnit2EditPart.VISUAL_ID:

+		case ConditionalUnit2EditPart.VISUAL_ID:

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7008SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ff08a3b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit2CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit2CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3007);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3003 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3004 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3022 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3026 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3030 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3034 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..5c3a9ef
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7012SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+		case SequentialUnit2EditPart.VISUAL_ID:

+		case ConditionalUnit2EditPart.VISUAL_ID:

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7012SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..7f1e506
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit2CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit2CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3025);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3003 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3004 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3022 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3026 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3030 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3034 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..78cf230
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7016SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+		case SequentialUnit2EditPart.VISUAL_ID:

+		case ConditionalUnit2EditPart.VISUAL_ID:

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7016SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..44ba2ab
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit2CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit2CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3029);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3003 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3004 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3022 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3026 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3030 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3034 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..3b1b22a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7022SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+		case SequentialUnit2EditPart.VISUAL_ID:

+		case ConditionalUnit2EditPart.VISUAL_ID:

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7022SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f789470
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit2CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit2CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3033);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3003 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3004 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3022 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3026 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3030 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3034 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..90d7e1e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7040SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+		case SequentialUnit2EditPart.VISUAL_ID:

+		case ConditionalUnit2EditPart.VISUAL_ID:

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7040SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..db05e99
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit2CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit2CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_3047);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3003 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3004 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3022 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3026 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3030 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3034 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..12c816c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getCartesianQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7002SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+		case SequentialUnit2EditPart.VISUAL_ID:

+		case ConditionalUnit2EditPart.VISUAL_ID:

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7002SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..fd82b00
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit2CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit2CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit2CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_2002);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3003 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3004 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3022 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3026 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3030 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3034 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4d79cb6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CartesianQueuedUnitItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort2CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CartesianQueuedUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CartesianQueuedUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CartesianQueuedUnit_2002);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3002 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnitEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CompositeRefactoringCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CompositeRefactoringCanonicalEditPolicy.java
new file mode 100644
index 0000000..f954d7a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CompositeRefactoringCanonicalEditPolicy.java
@@ -0,0 +1,1402 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+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.LinkedList;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+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 comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.AtomicUnitEditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitEditPart;

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitEditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitEditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPortEditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelLinkDescriptor;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class CompositeRefactoringCanonicalEditPolicy extends

+		CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getModelRefactoring_InputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getCompositeRefactoring_MainRefactoringUnit());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCompositeRefactoring_1000SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		if (view.getEAnnotation("Shortcut") != null) { //$NON-NLS-1$

+			return ComrelDiagramUpdater.isShortcutOrphaned(view);

+		}

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleInputPortEditPart.VISUAL_ID:

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+		case SequentialUnitEditPart.VISUAL_ID:

+		case ConditionalUnitEditPart.VISUAL_ID:

+		case AtomicUnitEditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getCompositeRefactoring_1000SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+			if (v.getEAnnotation("Shortcut") != null && ComrelDiagramUpdater.isShortcutOrphaned(v)) { //$NON-NLS-1$

+				orphaned.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+

+		Collection<IAdaptable> createdConnectionViews = 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<IAdaptable> refreshConnections() {

+		Map<EObject, View> domain2NotationMap = new HashMap<EObject, View>();

+		Collection<ComrelLinkDescriptor> linkDescriptors = collectAllLinks(

+				getDiagram(), domain2NotationMap);

+		Collection existingLinks = new LinkedList(getDiagram().getEdges());

+		for (Iterator linksIterator = existingLinks.iterator(); linksIterator

+				.hasNext();) {

+			Edge nextDiagramLink = (Edge) linksIterator.next();

+			int diagramLinkVisualID = ComrelVisualIDRegistry

+					.getVisualID(nextDiagramLink);

+			if (diagramLinkVisualID == -1) {

+				if (nextDiagramLink.getSource() != null

+						&& nextDiagramLink.getTarget() != null) {

+					linksIterator.remove();

+				}

+				continue;

+			}

+			EObject diagramLinkObject = nextDiagramLink.getElement();

+			EObject diagramLinkSrc = nextDiagramLink.getSource().getElement();

+			EObject diagramLinkDst = nextDiagramLink.getTarget().getElement();

+			for (Iterator<ComrelLinkDescriptor> linkDescriptorsIterator = linkDescriptors

+					.iterator(); linkDescriptorsIterator.hasNext();) {

+				ComrelLinkDescriptor nextLinkDescriptor = linkDescriptorsIterator

+						.next();

+				if (diagramLinkObject == nextLinkDescriptor.getModelElement()

+						&& diagramLinkSrc == nextLinkDescriptor.getSource()

+						&& diagramLinkDst == nextLinkDescriptor

+								.getDestination()

+						&& diagramLinkVisualID == nextLinkDescriptor

+								.getVisualID()) {

+					linksIterator.remove();

+					linkDescriptorsIterator.remove();

+					break;

+				}

+			}

+		}

+		deleteViews(existingLinks.iterator());

+		return createConnections(linkDescriptors, domain2NotationMap);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<ComrelLinkDescriptor> collectAllLinks(View view,

+			Map<EObject, View> domain2NotationMap) {

+		if (!CompositeRefactoringEditPart.MODEL_ID

+				.equals(ComrelVisualIDRegistry.getModelID(view))) {

+			return Collections.emptyList();

+		}

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+		case CompositeRefactoringEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCompositeRefactoring_1000ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPortEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_2001ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case CartesianQueuedUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCartesianQueuedUnit_2002ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ParallelQueuedUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getParallelQueuedUnit_2003ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleQueuedUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleQueuedUnit_2004ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SequentialUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSequentialUnit_2005ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionalUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionalUnit_2006ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case AtomicUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getAtomicUnit_2007ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3001ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPortEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3002ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case CartesianQueuedUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCartesianQueuedUnit_3003ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ParallelQueuedUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getParallelQueuedUnit_3004ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3005ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3006ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case CartesianQueuedUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCartesianQueuedUnit_3007ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFeatureUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFeatureUnit_3008ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3009ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3010ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleOutputPortEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleOutputPort_3011ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFeatureUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFeatureUnit_3012ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3013ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3014ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiOutputPortEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiOutputPort_3015ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFilterUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFilterUnit_3016ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3017ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleOutputPort2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleOutputPort_3018ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFilterUnitEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFilterUnit_3019ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3020ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiOutputPort2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiOutputPort_3021ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleQueuedUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleQueuedUnit_3022ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3023ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3024ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case CartesianQueuedUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCartesianQueuedUnit_3025ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SequentialUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSequentialUnit_3026ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3027ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort8EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3028ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case CartesianQueuedUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCartesianQueuedUnit_3029ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionalUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionalUnit_3030ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort8EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3031ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiInputPort9EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiInputPort_3032ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case CartesianQueuedUnit6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCartesianQueuedUnit_3033ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case AtomicUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getAtomicUnit_3034ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleInputPort9EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleInputPort_3035ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ParallelQueuedUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getParallelQueuedUnit_3036ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ParallelQueuedUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getParallelQueuedUnit_3037ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFeatureUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFeatureUnit_3038ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFeatureUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFeatureUnit_3039ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFilterUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFilterUnit_3040ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFilterUnit2EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFilterUnit_3041ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleQueuedUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleQueuedUnit_3042ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ParallelQueuedUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getParallelQueuedUnit_3043ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SequentialUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSequentialUnit_3044ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ParallelQueuedUnit6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getParallelQueuedUnit_3045ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionalUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionalUnit_3046ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case CartesianQueuedUnit7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getCartesianQueuedUnit_3047ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ParallelQueuedUnit7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getParallelQueuedUnit_3048ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case AtomicUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getAtomicUnit_3049ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFeatureUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFeatureUnit_3050ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFeatureUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFeatureUnit_3051ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFilterUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFilterUnit_3052ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFilterUnit3EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFilterUnit_3053ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleQueuedUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleQueuedUnit_3054ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFeatureUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFeatureUnit_3055ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFeatureUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFeatureUnit_3056ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFilterUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFilterUnit_3057ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFilterUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFilterUnit_3058ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleQueuedUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleQueuedUnit_3059ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SequentialUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSequentialUnit_3060ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFeatureUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFeatureUnit_3061ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFeatureUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFeatureUnit_3062ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleFilterUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleFilterUnit_3063ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiFilterUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiFilterUnit_3064ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleQueuedUnit6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleQueuedUnit_3065ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionalUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionalUnit_3066ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SingleQueuedUnit7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSingleQueuedUnit_3067ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case AtomicUnit4EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getAtomicUnit_3068ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SequentialUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSequentialUnit_3069ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SequentialUnit6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSequentialUnit_3070ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionalUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionalUnit_3071ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionalUnit6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionalUnit_3072ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SequentialUnit7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSequentialUnit_3073ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case AtomicUnit5EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getAtomicUnit_3074ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionalUnit7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionalUnit_3075ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case ConditionCheckEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getConditionCheck_3076ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case AtomicUnit6EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getAtomicUnit_3077ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case AtomicUnit7EditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getAtomicUnit_3078ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case SinglePortMappingEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getSinglePortMapping_4001ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiPortMappingEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiPortMapping_4002ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		case MultiSinglePortMappingEditPart.VISUAL_ID: {

+			if (!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(ComrelDiagramUpdater

+						.getMultiSinglePortMapping_4003ContainedLinks(view));

+			}

+			if (!domain2NotationMap.containsKey(view.getElement())

+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$

+				domain2NotationMap.put(view.getElement(), view);

+			}

+			break;

+		}

+		}

+		for (Iterator children = view.getChildren().iterator(); children

+				.hasNext();) {

+			result.addAll(collectAllLinks((View) children.next(),

+					domain2NotationMap));

+		}

+		for (Iterator edges = view.getSourceEdges().iterator(); edges.hasNext();) {

+			result.addAll(collectAllLinks((View) edges.next(),

+					domain2NotationMap));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<IAdaptable> createConnections(

+			Collection<ComrelLinkDescriptor> linkDescriptors,

+			Map<EObject, View> domain2NotationMap) {

+		LinkedList<IAdaptable> adapters = new LinkedList<IAdaptable>();

+		for (ComrelLinkDescriptor nextLinkDescriptor : linkDescriptors) {

+			EditPart sourceEditPart = getEditPart(

+					nextLinkDescriptor.getSource(), domain2NotationMap);

+			EditPart targetEditPart = getEditPart(

+					nextLinkDescriptor.getDestination(), domain2NotationMap);

+			if (sourceEditPart == null || targetEditPart == null) {

+				continue;

+			}

+			CreateConnectionViewRequest.ConnectionViewDescriptor descriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(

+					nextLinkDescriptor.getSemanticAdapter(),

+					ComrelVisualIDRegistry.getType(nextLinkDescriptor

+							.getVisualID()), 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 getEditPart(EObject domainModelElement,

+			Map<EObject, View> domain2NotationMap) {

+		View view = (View) domain2NotationMap.get(domainModelElement);

+		if (view != null) {

+			return (EditPart) getHost().getViewer().getEditPartRegistry()

+					.get(view);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Diagram getDiagram() {

+		return ((View) getHost().getModel()).getDiagram();

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CompositeRefactoringItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CompositeRefactoringItemSemanticEditPolicy.java
new file mode 100644
index 0000000..1d7ed72
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/CompositeRefactoringItemSemanticEditPolicy.java
@@ -0,0 +1,91 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.commands.Command;

+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.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

+

+import comrel.diagram.edit.commands.AtomicUnitCreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnitCreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnitCreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnitCreateCommand;

+import comrel.diagram.edit.commands.SequentialUnitCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnitCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class CompositeRefactoringItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CompositeRefactoringItemSemanticEditPolicy() {

+		super(ComrelElementTypes.CompositeRefactoring_1000);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_2001 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPortCreateCommand(req));

+		}

+		if (ComrelElementTypes.CartesianQueuedUnit_2002 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_2003 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_2004 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_2005 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_2006 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnitCreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_2007 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnitCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())

+				.getEditingDomain();

+		return getGEFWrapper(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/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelBaseItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelBaseItemSemanticEditPolicy.java
new file mode 100644
index 0000000..7a4e5bb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelBaseItemSemanticEditPolicy.java
@@ -0,0 +1,607 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.ReconnectRequest;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+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.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 comrel.AtomicUnit;

+import comrel.CompositeRefactoring;

+import comrel.CompositeUnit;

+import comrel.ComrelPackage;

+import comrel.HelperUnit;

+import comrel.InputPort;

+import comrel.MultiInputPort;

+import comrel.MultiPort;

+import comrel.MultiPortMapping;

+import comrel.MultiSinglePortMapping;

+import comrel.OutputPort;

+import comrel.PortMapping;

+import comrel.QueuedUnit;

+import comrel.RefactoringUnit;

+import comrel.SingleInputPort;

+import comrel.SinglePort;

+import comrel.SinglePortMapping;

+import comrel.diagram.edit.helpers.ComrelBaseEditHelper;

+import comrel.diagram.expressions.ComrelOCLFactory;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ComrelBaseItemSemanticEditPolicy extends SemanticEditPolicy {

+

+	/**

+	 * Extended request data key to hold editpart visual id.

+	 * @generated

+	 */

+	public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final IElementType myElementType;

+

+	/**

+	 * @generated

+	 */

+	protected ComrelBaseItemSemanticEditPolicy(IElementType elementType) {

+		myElementType = elementType;

+	}

+

+	/**

+	 * Extended request data key to hold editpart visual id.

+	 * Add visual id of edited editpart to extended data of the request

+	 * so command switch can decide what kind of diagram element is being edited.

+	 * It is done in those cases when it's not possible to deduce diagram

+	 * element kind from domain element.

+	 * 

+	 * @generated

+	 */

+	public Command getCommand(Request request) {

+		if (request instanceof ReconnectRequest) {

+			Object view = ((ReconnectRequest) request).getConnectionEditPart()

+					.getModel();

+			if (view instanceof View) {

+				Integer id = new Integer(

+						ComrelVisualIDRegistry.getVisualID((View) view));

+				request.getExtendedData().put(VISUAL_ID_KEY, id);

+			}

+		}

+		return super.getCommand(request);

+	}

+

+	/**

+	 * Returns visual id from request parameters.

+	 * @generated

+	 */

+	protected int getVisualID(IEditCommandRequest request) {

+		Object id = request.getParameter(VISUAL_ID_KEY);

+		return id instanceof Integer ? ((Integer) id).intValue() : -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getSemanticCommand(IEditCommandRequest request) {

+		IEditCommandRequest completedRequest = completeRequest(request);

+		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

+		semanticCommand = getEditHelperCommand(completedRequest,

+				semanticCommand);

+		if (completedRequest instanceof DestroyRequest) {

+			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;

+			return shouldProceed(destroyRequest) ? addDeleteViewCommand(

+					semanticCommand, destroyRequest) : null;

+		}

+		return semanticCommand;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command addDeleteViewCommand(Command mainCommand,

+			DestroyRequest completedRequest) {

+		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(

+				getEditingDomain(), (View) getHost().getModel()));

+		return mainCommand == null ? deleteViewCommand : mainCommand

+				.chain(deleteViewCommand);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Command getEditHelperCommand(IEditCommandRequest request,

+			Command editPolicyCommand) {

+		if (editPolicyCommand != null) {

+			ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy) editPolicyCommand)

+					.getICommand() : new CommandProxy(editPolicyCommand);

+			request.setParameter(ComrelBaseEditHelper.EDIT_POLICY_COMMAND,

+					command);

+		}

+		IElementType requestContextElementType = getContextElementType(request);

+		request.setParameter(ComrelBaseEditHelper.CONTEXT_ELEMENT_TYPE,

+				requestContextElementType);

+		ICommand command = requestContextElementType.getEditCommand(request);

+		request.setParameter(ComrelBaseEditHelper.EDIT_POLICY_COMMAND, null);

+		request.setParameter(ComrelBaseEditHelper.CONTEXT_ELEMENT_TYPE, null);

+		if (command != null) {

+			if (!(command instanceof CompositeTransactionalCommand)) {

+				command = new CompositeTransactionalCommand(getEditingDomain(),

+						command.getLabel()).compose(command);

+			}

+			return new ICommandProxy(command);

+		}

+		return editPolicyCommand;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IElementType getContextElementType(IEditCommandRequest request) {

+		IElementType requestContextElementType = ComrelElementTypes

+				.getElementType(getVisualID(request));

+		return requestContextElementType != null ? requestContextElementType

+				: myElementType;

+	}

+

+	/**

+	 * @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;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		return null;

+	}

+

+	/**

+	 * @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 final Command getGEFWrapper(ICommand cmd) {

+		return new ICommandProxy(cmd);

+	}

+

+	/**

+	 * Returns editing domain from the host edit part.

+	 * @generated

+	 */

+	protected TransactionalEditingDomain getEditingDomain() {

+		return ((IGraphicalEditPart) getHost()).getEditingDomain();

+	}

+

+	/**

+	 * Clean all shortcuts to the host element from the same diagram

+	 * @generated

+	 */

+	protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {

+		assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$

+		for (Iterator it = view.getDiagram().getChildren().iterator(); it

+				.hasNext();) {

+			View nextView = (View) it.next();

+			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$

+				continue;

+			}

+			cmd.add(new DeleteCommand(getEditingDomain(), nextView));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static LinkConstraints getLinkConstraints() {

+		LinkConstraints cached = ComrelDiagramEditorPlugin.getInstance()

+				.getLinkConstraints();

+		if (cached == null) {

+			ComrelDiagramEditorPlugin.getInstance().setLinkConstraints(

+					cached = new LinkConstraints());

+		}

+		return cached;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static class LinkConstraints {

+

+		/**

+		 * @generated

+		 */

+		LinkConstraints() {

+			// use static method #getLinkConstraints() to access instance

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateSinglePortMapping_4001(

+				CompositeRefactoring container, SinglePort source,

+				SingleInputPort target) {

+			return canExistSinglePortMapping_4001(container, null, source,

+					target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateMultiPortMapping_4002(

+				CompositeRefactoring container, MultiPort source,

+				MultiInputPort target) {

+			return canExistMultiPortMapping_4002(container, null, source,

+					target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateMultiSinglePortMapping_4003(

+				CompositeRefactoring container, MultiPort source,

+				SingleInputPort target) {

+			return canExistMultiSinglePortMapping_4003(container, null, source,

+					target);

+		}

+

+		/**

+		 * @generated NOT

+		 */

+		public boolean canExistSinglePortMapping_4001(

+				CompositeRefactoring container, SinglePortMapping linkInstance,

+				SinglePort source, SingleInputPort target) {

+			try {

+				if (source == null) {

+					return true;

+				} else if (!singlePortMappingRules(container, source, target)) {

+					return false;

+				}

+

+				else {

+					Map<String, EClassifier> env = Collections

+							.<String, EClassifier> singletonMap(

+									"oppositeEnd", ComrelPackage.eINSTANCE.getSingleInputPort()); //$NON-NLS-1$

+					Object sourceVal = ComrelOCLFactory.getExpression(0,

+							ComrelPackage.eINSTANCE.getSinglePort(), env)

+							.evaluate(

+									source,

+									Collections.singletonMap(

+											"oppositeEnd", target)); //$NON-NLS-1$

+					if (false == sourceVal instanceof Boolean

+							|| !((Boolean) sourceVal).booleanValue()) {

+						return false;

+					} // else fall-through

+				}

+				return true;

+			} catch (Exception e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+

+		/**

+		 * @generated NOT

+		 */

+		public boolean canExistMultiPortMapping_4002(

+				CompositeRefactoring container, MultiPortMapping linkInstance,

+				MultiPort source, MultiInputPort target) {

+			try {

+				if (source == null) {

+					return true;

+				} else if (!multiPortMappingRules(container, source, target)) {

+					return false;

+				}

+

+				else {

+					Map<String, EClassifier> env = Collections

+							.<String, EClassifier> singletonMap(

+									"oppositeEnd", ComrelPackage.eINSTANCE.getMultiInputPort()); //$NON-NLS-1$

+					Object sourceVal = ComrelOCLFactory.getExpression(1,

+							ComrelPackage.eINSTANCE.getMultiPort(), env)

+							.evaluate(

+									source,

+									Collections.singletonMap(

+											"oppositeEnd", target)); //$NON-NLS-1$

+					if (false == sourceVal instanceof Boolean

+							|| !((Boolean) sourceVal).booleanValue()) {

+						return false;

+					} // else fall-through

+				}

+				return true;

+			} catch (Exception e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+

+		/**

+		 * @generated NOT

+		 */

+		public boolean canExistMultiSinglePortMapping_4003(

+				CompositeRefactoring container,

+				MultiSinglePortMapping linkInstance, MultiPort source,

+				SingleInputPort target) {

+			try {

+				if (source == null) {

+					return true;

+				} else if (!multiSinglePortMappingRules(container, source,

+						target)) {

+					return false;

+				}

+

+				else {

+					Map<String, EClassifier> env = Collections

+							.<String, EClassifier> singletonMap(

+									"oppositeEnd", ComrelPackage.eINSTANCE.getSingleInputPort()); //$NON-NLS-1$

+					Object sourceVal = ComrelOCLFactory.getExpression(2,

+							ComrelPackage.eINSTANCE.getMultiPort(), env)

+							.evaluate(

+									source,

+									Collections.singletonMap(

+											"oppositeEnd", target)); //$NON-NLS-1$

+					if (false == sourceVal instanceof Boolean

+							|| !((Boolean) sourceVal).booleanValue()) {

+						return false;

+					} // else fall-through

+				}

+				return true;

+			} catch (Exception e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+

+		private static boolean singlePortMappingRules(

+				comrel.CompositeRefactoring container, comrel.Port source,

+				comrel.InputPort target) {

+			boolean result = true;

+			result &= sameType(container, source, target);

+			result &= rightEbene(container, source, target);

+			result &= onlyOneInput(container, source, target);

+			return result;

+		}

+

+		private static boolean multiPortMappingRules(

+				comrel.CompositeRefactoring container, comrel.Port source,

+				comrel.InputPort target) {

+			boolean result = true;

+			result &= sameType(container, source, target);

+			result &= rightEbene(container, source, target);

+			result &= onlyOneInput(container, source, target);

+			return result;

+		}

+

+		private static boolean multiSinglePortMappingRules(

+				comrel.CompositeRefactoring container, comrel.Port source,

+				comrel.InputPort target) {

+			boolean result = true;

+			result &= rightSourceTargetType(container, source, target);

+			result &= rightEbene(container, source, target);

+			result &= onlyOneInput(container, source, target);

+			result &= sameType(container, source, target);

+			return result;

+		}

+

+		private static boolean rightSourceTargetType(

+				comrel.CompositeRefactoring container, comrel.Port source,

+				comrel.InputPort target) {

+			boolean result = true;

+			if (source != null) {

+				result &= (source instanceof InputPort);

+				result &= (source.eContainer() instanceof QueuedUnit);

+			}

+			return result;

+		}

+

+		private static boolean sameType(comrel.CompositeRefactoring container,

+				comrel.Port source, comrel.InputPort target) {

+			boolean result = true;

+			if (source != null && target != null) {

+				if (source.getType() != null && target.getType() != null) {

+					result = source.getType().equals(target.getType());

+				} else {

+					result = true;

+				}

+			}

+			return result;

+		}

+

+	}

+

+	private static boolean rightEbene(comrel.CompositeRefactoring container,

+			comrel.Port source, comrel.InputPort target) {

+		boolean result = true;

+		if (source != null) {

+			if (source.eContainer() instanceof HelperUnit)

+				result &= (source instanceof OutputPort);

+			if (source.eContainer() instanceof AtomicUnit) {

+				result = false;

+			}

+			if (target != null) {

+				if (source.eContainer() instanceof CompositeUnit) {

+					result &= source.eContainer() == target.eContainer()

+							.eContainer();

+

+				}

+				if (source.eContainer() instanceof HelperUnit) {

+					if (target.eContainer() instanceof HelperUnit) {

+						result &= source.eContainer() != target.eContainer();

+					}

+					result &= (source.eContainer().eContainer() == target

+							.eContainer().eContainer());

+				}

+			}

+

+		}

+		return result;

+	}

+

+	private static boolean onlyOneInput(comrel.CompositeRefactoring container,

+			comrel.Port source, comrel.InputPort target) {

+		boolean result = true;

+		if (target != null) {

+			List<InputPort> ports = new ArrayList<InputPort>();

+			EObject portContainer = target.eContainer();

+			if (portContainer instanceof RefactoringUnit) {

+				RefactoringUnit refUnit = (RefactoringUnit) portContainer;

+				ports.addAll(refUnit.getAllInputPorts());

+			}

+			if (portContainer instanceof HelperUnit) {

+				HelperUnit helperUnit = (HelperUnit) portContainer;

+				ports.add(helperUnit.getInputPort());

+			}

+			InputPort p = null;

+			for (InputPort in : ports) {

+				if (target == in) {

+					p = in;

+					break;

+				}

+			}

+			if (p != null) {

+				List<PortMapping> mappings = container.getPortMappings();

+				for (PortMapping mapping : mappings) {

+					if (mapping.getTarget() == p) {

+						return false;

+					}

+				}

+			}

+		}

+		return result;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelTextNonResizableEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelTextNonResizableEditPolicy.java
new file mode 100644
index 0000000..3236d8d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelTextNonResizableEditPolicy.java
@@ -0,0 +1,228 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ColorConstants;

+import org.eclipse.draw2d.Figure;

+import org.eclipse.draw2d.FigureListener;

+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.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.WrappingLabel;

+

+/**

+ * @generated

+ */

+public class ComrelTextNonResizableEditPolicy extends NonResizableEditPolicyEx {

+

+	/**

+	 * @generated

+	 */

+	private IFigure selectionFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private IFigure focusFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private FigureListener hostPositionListener;

+

+	/**

+	 * @generated

+	 */

+	protected void showPrimarySelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			showSelection();

+			showFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			hideSelection();

+			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

+			getHostFigure().addFigureListener(getHostPositionListener());

+			refreshSelectionFeedback();

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(false);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (selectionFeedbackFigure != null) {

+				removeFeedback(selectionFeedbackFigure);

+				getHostFigure().removeFigureListener(getHostPositionListener());

+				selectionFeedbackFigure = null;

+			}

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			hideFocus();

+			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

+			refreshFocusFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (focusFeedbackFigure != null) {

+				removeFeedback(focusFeedbackFigure);

+				focusFeedbackFigure = null;

+			}

+		}

+	}

+

+	/**

+	 * @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

+	 */

+	private FigureListener getHostPositionListener() {

+		if (hostPositionListener == null) {

+			hostPositionListener = new FigureListener() {

+				public void figureMoved(IFigure source) {

+					refreshFeedback();

+				}

+			};

+		}

+		return hostPositionListener;

+	}

+

+	/**

+	 * @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/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelTextSelectionEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelTextSelectionEditPolicy.java
new file mode 100644
index 0000000..3487cc7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ComrelTextSelectionEditPolicy.java
@@ -0,0 +1,212 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.draw2d.ColorConstants;

+import org.eclipse.draw2d.Figure;

+import org.eclipse.draw2d.FigureListener;

+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.editpolicies.SelectionEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+

+/**

+ * @generated

+ */

+public class ComrelTextSelectionEditPolicy extends SelectionEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private IFigure selectionFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private IFigure focusFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private FigureListener hostPositionListener;

+

+	/**

+	 * @generated

+	 */

+	protected void showPrimarySelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			showSelection();

+			showFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(true);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			hideSelection();

+			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

+			getHostFigure().addFigureListener(getHostPositionListener());

+			refreshSelectionFeedback();

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideSelection() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setSelected(false);

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (selectionFeedbackFigure != null) {

+				removeFeedback(selectionFeedbackFigure);

+				getHostFigure().removeFigureListener(getHostPositionListener());

+				selectionFeedbackFigure = null;

+			}

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(true);

+		} else {

+			hideFocus();

+			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

+			refreshFocusFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideFocus() {

+		if (getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel) getHostFigure()).setFocus(false);

+		} else {

+			if (focusFeedbackFigure != null) {

+				removeFeedback(focusFeedbackFigure);

+				focusFeedbackFigure = null;

+			}

+		}

+	}

+

+	/**

+	 * @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

+	 */

+	private FigureListener getHostPositionListener() {

+		if (hostPositionListener == null) {

+			hostPositionListener = new FigureListener() {

+				public void figureMoved(IFigure source) {

+					refreshFeedback();

+				}

+			};

+		}

+		return hostPositionListener;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionCheckItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionCheckItemSemanticEditPolicy.java
new file mode 100644
index 0000000..9c1db5b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionCheckItemSemanticEditPolicy.java
@@ -0,0 +1,49 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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;

+

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionCheckItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionCheckItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionCheck_3076);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..3037a1a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit2CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3030SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort8EditPart.VISUAL_ID

+				|| visualID == MultiInputPort9EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3030SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..3508ee7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,337 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort9CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort8CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitElseCompartmentEditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitIfCompartmentEditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitThenCompartmentEditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3030);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3031 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort8CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3032 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case ConditionCheckEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..a32ee71
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit3CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3046SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort8EditPart.VISUAL_ID

+				|| visualID == MultiInputPort9EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3046SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0ffd6eb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,337 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort9CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort8CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitElseCompartment2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitIfCompartment2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitThenCompartment2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3046);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3031 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort8CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3032 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case ConditionCheckEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..2d5e8e6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit4CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3066SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort8EditPart.VISUAL_ID

+				|| visualID == MultiInputPort9EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3066SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c4e7730
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,337 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort9CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort8CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitElseCompartment3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitIfCompartment3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitThenCompartment3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3066);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3031 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort8CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3032 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case ConditionCheckEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..0d09f7a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit5CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3071SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort8EditPart.VISUAL_ID

+				|| visualID == MultiInputPort9EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3071SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a50d73f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,337 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort9CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort8CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitElseCompartment4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitIfCompartment4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitThenCompartment4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3031 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort8CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3032 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case ConditionCheckEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit6CanonicalEditPolicy.java
new file mode 100644
index 0000000..27bac95
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit6CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit6CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3072SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort8EditPart.VISUAL_ID

+				|| visualID == MultiInputPort9EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3072SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c007e67
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit6ItemSemanticEditPolicy.java
@@ -0,0 +1,337 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort9CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort8CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitElseCompartment5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitIfCompartment5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitThenCompartment5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3031 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort8CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3032 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case ConditionCheckEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit7CanonicalEditPolicy.java
new file mode 100644
index 0000000..4ae856c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit7CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit7CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3075SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort8EditPart.VISUAL_ID

+				|| visualID == MultiInputPort9EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_3075SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..776b0ad
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnit7ItemSemanticEditPolicy.java
@@ -0,0 +1,337 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort9CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort8CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitElseCompartment6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitIfCompartment6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitThenCompartment6EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnit7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnit7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3031 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort8CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3032 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case ConditionCheckEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..37c5050
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitCanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_2006SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort8EditPart.VISUAL_ID

+				|| visualID == MultiInputPort9EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnit_2006SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..b9072c1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Else();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7038SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+		case SequentialUnit7EditPart.VISUAL_ID:

+		case ConditionalUnit7EditPart.VISUAL_ID:

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7038SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b6069b6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit7CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit7CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit7CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit7CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3046);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3047 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3048 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3067 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3073 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3075 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3078 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..72f96d6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Else();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7054SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+		case SequentialUnit7EditPart.VISUAL_ID:

+		case ConditionalUnit7EditPart.VISUAL_ID:

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7054SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..64bb6ec
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit7CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit7CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit7CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit7CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3066);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3047 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3048 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3067 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3073 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3075 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3078 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..5fa5764
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Else();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7064SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+		case SequentialUnit7EditPart.VISUAL_ID:

+		case ConditionalUnit7EditPart.VISUAL_ID:

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7064SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..756c5b2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit7CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit7CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit7CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit7CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3047 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3048 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3067 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3073 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3075 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3078 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..d18ccfb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Else();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7068SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+		case SequentialUnit7EditPart.VISUAL_ID:

+		case ConditionalUnit7EditPart.VISUAL_ID:

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7068SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4a60d6e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit7CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit7CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit7CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit7CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3047 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3048 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3067 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3073 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3075 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3078 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..18ff0f6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Else();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7074SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+		case SequentialUnit7EditPart.VISUAL_ID:

+		case ConditionalUnit7EditPart.VISUAL_ID:

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7074SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4815533
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit7CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit7CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit7CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit7CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3047 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3048 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3067 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3073 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3075 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3078 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..7b1cd85
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Else();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7084SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+		case SequentialUnit7EditPart.VISUAL_ID:

+		case ConditionalUnit7EditPart.VISUAL_ID:

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7084SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a50404e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit7CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit7CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit7CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit7CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_2006);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3047 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3048 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3067 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3073 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3075 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3078 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..a8e3119
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Else();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7020SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+		case SequentialUnit7EditPart.VISUAL_ID:

+		case ConditionalUnit7EditPart.VISUAL_ID:

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitElseCompartment_7020SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..001e732
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitElseCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit7CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit7CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit7CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit7CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit7CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitElseCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitElseCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3030);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3047 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3048 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3067 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3073 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3075 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit7CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3078 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..1490299
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7036SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7036SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b040aa4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3046);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3050 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3051 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3052 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3053 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..01b9af5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7052SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7052SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..77b5b46
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3066);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3050 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3051 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3052 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3053 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..03337cb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7062SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7062SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..db7ede1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3050 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3051 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3052 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3053 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..1dfc9e2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7066SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7066SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f8e9e65
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3050 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3051 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3052 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3053 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..b5ea562
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7072SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7072SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b855fe7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3050 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3051 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3052 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3053 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..b824de8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7082SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7082SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f565c6f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_2006);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3050 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3051 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3052 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3053 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..eba6680
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7018SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitHelperUnitsCompartment_7018SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a1e7f56
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitHelperUnitsCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitHelperUnitsCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3030);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3050 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3051 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3052 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3053 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..ae7096a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,163 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_If();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7035SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return ConditionCheckEditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7035SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ce9b642
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.ConditionCheckCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3046);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.ConditionCheck_3076 == req.getElementType()) {

+			return getGEFWrapper(new ConditionCheckCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..f57feef
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,163 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_If();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7051SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return ConditionCheckEditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7051SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4806b7c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.ConditionCheckCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3066);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.ConditionCheck_3076 == req.getElementType()) {

+			return getGEFWrapper(new ConditionCheckCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..076c16f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,163 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_If();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7061SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return ConditionCheckEditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7061SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..30c1a81
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.ConditionCheckCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.ConditionCheck_3076 == req.getElementType()) {

+			return getGEFWrapper(new ConditionCheckCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..f7d6893
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,163 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_If();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7065SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return ConditionCheckEditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7065SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f261fe6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.ConditionCheckCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.ConditionCheck_3076 == req.getElementType()) {

+			return getGEFWrapper(new ConditionCheckCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..e21423b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,163 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_If();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7071SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return ConditionCheckEditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7071SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0f0d38b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.ConditionCheckCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.ConditionCheck_3076 == req.getElementType()) {

+			return getGEFWrapper(new ConditionCheckCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..69f54c8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,163 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_If();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7081SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return ConditionCheckEditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7081SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..89458ce
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.ConditionCheckCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_2006);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.ConditionCheck_3076 == req.getElementType()) {

+			return getGEFWrapper(new ConditionCheckCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..444ecac
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,163 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_If();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7017SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return ConditionCheckEditPart.VISUAL_ID == ComrelVisualIDRegistry

+				.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitIfCompartment_7017SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..5c7fd48
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitIfCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.ConditionCheckCreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitIfCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitIfCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3030);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.ConditionCheck_3076 == req.getElementType()) {

+			return getGEFWrapper(new ConditionCheckCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..28e9ddc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Then();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7037SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+		case SequentialUnit5EditPart.VISUAL_ID:

+		case ConditionalUnit6EditPart.VISUAL_ID:

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7037SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..827cb41
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit6CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit6CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3046);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3033 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3036 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3054 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3069 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3072 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3077 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit6CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..a7ceb68
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Then();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7053SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+		case SequentialUnit5EditPart.VISUAL_ID:

+		case ConditionalUnit6EditPart.VISUAL_ID:

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7053SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..36d65f3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit6CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit6CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3066);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3033 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3036 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3054 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3069 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3072 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3077 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit6CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..0edff4b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Then();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7063SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+		case SequentialUnit5EditPart.VISUAL_ID:

+		case ConditionalUnit6EditPart.VISUAL_ID:

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7063SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..11b29a5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit6CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit6CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3033 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3036 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3054 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3069 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3072 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3077 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit6CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..27254c1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Then();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7067SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+		case SequentialUnit5EditPart.VISUAL_ID:

+		case ConditionalUnit6EditPart.VISUAL_ID:

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7067SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0ebda23
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit6CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit6CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3033 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3036 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3054 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3069 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3072 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3077 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit6CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..25268f4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Then();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7073SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+		case SequentialUnit5EditPart.VISUAL_ID:

+		case ConditionalUnit6EditPart.VISUAL_ID:

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7073SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ba973c8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit6CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit6CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3033 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3036 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3054 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3069 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3072 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3077 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit6CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..47e768c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Then();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7083SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+		case SequentialUnit5EditPart.VISUAL_ID:

+		case ConditionalUnit6EditPart.VISUAL_ID:

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7083SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..aafa917
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit6CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit6CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_2006);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3033 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3036 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3054 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3069 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3072 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3077 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit6CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..4de5f03
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getConditionalUnit_Then();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7019SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+		case SequentialUnit5EditPart.VISUAL_ID:

+		case ConditionalUnit6EditPart.VISUAL_ID:

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getConditionalUnitConditionalUnitThenCompartment_7019SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..00233df
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitConditionalUnitThenCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit6CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit6CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitConditionalUnitThenCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitConditionalUnitThenCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_3030);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3033 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3036 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3054 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3069 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3072 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3077 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit6CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ef30e72
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ConditionalUnitItemSemanticEditPolicy.java
@@ -0,0 +1,337 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort9CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort8CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitElseCompartment7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitIfCompartment7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitConditionalUnitThenCompartment7EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ConditionalUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConditionalUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ConditionalUnit_2006);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3031 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort8CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3032 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort9CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort9EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case ConditionCheckEditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit7EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..b5d9ec1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit2CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3039SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort5EditPart.VISUAL_ID

+				|| visualID == MultiInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3039SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..7e48125
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,196 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort4CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort5CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFeatureUnit_3039);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3013 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3014 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3015 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..1a8c6b9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit3CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3051SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort5EditPart.VISUAL_ID

+				|| visualID == MultiInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3051SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..1495a3c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,196 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort4CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort5CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFeatureUnit_3051);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3013 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3014 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3015 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..fe106bc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit4CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3056SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort5EditPart.VISUAL_ID

+				|| visualID == MultiInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3056SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..55f2de7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,196 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort4CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort5CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFeatureUnit_3056);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3013 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3014 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3015 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..4b24cde
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit5CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3062SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort5EditPart.VISUAL_ID

+				|| visualID == MultiInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3062SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0cd3a42
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,196 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort4CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort5CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFeatureUnit_3062);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3013 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3014 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3015 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..d99c3aa
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnitCanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3012SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort5EditPart.VISUAL_ID

+				|| visualID == MultiInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFeatureUnit_3012SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..6ced61c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFeatureUnitItemSemanticEditPolicy.java
@@ -0,0 +1,196 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort4CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPortCreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort5CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFeatureUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFeatureUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFeatureUnit_3012);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3013 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3014 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3015 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..822998f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit2CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3041SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3041SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c7836ea
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,152 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort6CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFilterUnit_3041);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3020 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3021 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..f10b01f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit3CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3053SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3053SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..daf2f4a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,152 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort6CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFilterUnit_3053);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3020 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3021 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..712af78
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit4CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3058SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3058SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f314582
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,152 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort6CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFilterUnit_3058);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3020 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3021 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..e1974c3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit5CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3064SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3064SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..726e6f7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,152 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort6CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFilterUnit_3064);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3020 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3021 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..55ec48c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnitCanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getMultiFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3019SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getMultiFilterUnit_3019SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b285fa9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiFilterUnitItemSemanticEditPolicy.java
@@ -0,0 +1,152 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort6CreateCommand;

+import comrel.diagram.edit.commands.MultiOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiFilterUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiFilterUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiFilterUnit_3019);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3020 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiOutputPort_3021 == req.getElementType()) {

+			return getGEFWrapper(new MultiOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..6b97356
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort2ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3006);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..7e7d3e2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort3ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3010);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0f6c2f4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort4ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3014);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..cf79f49
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort5ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3017);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4dbd5a1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort6ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3020);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f0d39fc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort7ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3024);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort8ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort8ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..6e832e6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort8ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort8ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort8ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3028);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort9ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort9ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..831b527
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPort9ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPort9ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPort9ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3032);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPortItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPortItemSemanticEditPolicy.java
new file mode 100644
index 0000000..496f37a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiInputPortItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiInputPortItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiInputPortItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiInputPort_3002);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiOutputPort2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiOutputPort2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4cf9799
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiOutputPort2ItemSemanticEditPolicy.java
@@ -0,0 +1,137 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiOutputPort2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPort2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiOutputPort_3021);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return null;

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiOutputPortItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiOutputPortItemSemanticEditPolicy.java
new file mode 100644
index 0000000..47e5f66
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiOutputPortItemSemanticEditPolicy.java
@@ -0,0 +1,137 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiPortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiPortMappingReorientCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiOutputPortItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiOutputPortItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiOutputPort_3015);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return getGEFWrapper(new MultiPortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.MultiPortMapping_4002 == req.getElementType()) {

+			return null;

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiPortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiPortMappingItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiPortMappingItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ea6019a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiPortMappingItemSemanticEditPolicy.java
@@ -0,0 +1,32 @@
+/*

+ * 

+ */

+package comrel.diagram.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;

+

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiPortMappingItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiPortMappingItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiPortMapping_4002);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		return getGEFWrapper(new DestroyElementCommand(req));

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiSinglePortMappingItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiSinglePortMappingItemSemanticEditPolicy.java
new file mode 100644
index 0000000..9e54def
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/MultiSinglePortMappingItemSemanticEditPolicy.java
@@ -0,0 +1,32 @@
+/*

+ * 

+ */

+package comrel.diagram.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;

+

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class MultiSinglePortMappingItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public MultiSinglePortMappingItemSemanticEditPolicy() {

+		super(ComrelElementTypes.MultiSinglePortMapping_4003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		return getGEFWrapper(new DestroyElementCommand(req));

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/OpenDiagramEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/OpenDiagramEditPolicy.java
new file mode 100644
index 0000000..a055020
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/OpenDiagramEditPolicy.java
@@ -0,0 +1,204 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.io.IOException;

+import java.lang.reflect.InvocationTargetException;

+import java.util.Iterator;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.common.ui.URIEditorInput;

+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.util.EcoreUtil;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenEditPolicy;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.Style;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.part.ComrelDiagramEditor;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelDiagramEditorUtil;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class OpenDiagramEditPolicy extends OpenEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected Command getOpenCommand(Request request) {

+		EditPart targetEditPart = getTargetEditPart(request);

+		if (false == targetEditPart.getModel() instanceof View) {

+			return null;

+		}

+		View view = (View) targetEditPart.getModel();

+		Style link = view.getStyle(NotationPackage.eINSTANCE

+				.getHintedDiagramLinkStyle());

+		if (false == link instanceof HintedDiagramLinkStyle) {

+			return null;

+		}

+		return new ICommandProxy(new OpenDiagramCommand(

+				(HintedDiagramLinkStyle) link));

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class OpenDiagramCommand extends

+			AbstractTransactionalCommand {

+

+		/**

+		 * @generated

+		 */

+		private final HintedDiagramLinkStyle diagramFacet;

+

+		/**

+		 * @generated

+		 */

+		OpenDiagramCommand(HintedDiagramLinkStyle linkStyle) {

+			// editing domain is taken for original diagram, 

+			// if we open diagram from another file, we should use another editing domain

+			super(TransactionUtil.getEditingDomain(linkStyle),

+					Messages.CommandName_OpenDiagram, null);

+			diagramFacet = linkStyle;

+		}

+

+		// FIXME canExecute if  !(readOnly && getDiagramToOpen == null), i.e. open works on ro diagrams only when there's associated diagram already

+

+		/**

+		 * @generated

+		 */

+		protected CommandResult doExecuteWithResult(IProgressMonitor monitor,

+				IAdaptable info) throws ExecutionException {

+			try {

+				Diagram diagram = getDiagramToOpen();

+				if (diagram == null) {

+					diagram = intializeNewDiagram();

+				}

+				URI uri = EcoreUtil.getURI(diagram);

+				String editorName = uri.lastSegment() + '#'

+						+ diagram.eResource().getContents().indexOf(diagram);

+				IEditorInput editorInput = new URIEditorInput(uri, editorName);

+				IWorkbenchPage page = PlatformUI.getWorkbench()

+						.getActiveWorkbenchWindow().getActivePage();

+				page.openEditor(editorInput, getEditorID());

+				return CommandResult.newOKCommandResult();

+			} catch (Exception ex) {

+				throw new ExecutionException("Can't open diagram", ex);

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		protected Diagram getDiagramToOpen() {

+			return diagramFacet.getDiagramLink();

+		}

+

+		/**

+		 * @generated

+		 */

+		protected Diagram intializeNewDiagram() throws ExecutionException {

+			Diagram d = ViewService.createDiagram(getDiagramDomainElement(),

+					getDiagramKind(), getPreferencesHint());

+			if (d == null) {

+				throw new ExecutionException("Can't create diagram of '"

+						+ getDiagramKind() + "' kind");

+			}

+			diagramFacet.setDiagramLink(d);

+			assert diagramFacet.eResource() != null;

+			diagramFacet.eResource().getContents().add(d);

+			EObject container = diagramFacet.eContainer();

+			while (container instanceof View) {

+				((View) container).persist();

+				container = container.eContainer();

+			}

+			try {

+				new WorkspaceModifyOperation() {

+					protected void execute(IProgressMonitor monitor)

+							throws CoreException, InvocationTargetException,

+							InterruptedException {

+						try {

+							for (Iterator it = diagramFacet.eResource()

+									.getResourceSet().getResources().iterator(); it

+									.hasNext();) {

+								Resource nextResource = (Resource) it.next();

+								if (nextResource.isLoaded()

+										&& !getEditingDomain().isReadOnly(

+												nextResource)) {

+									nextResource.save(ComrelDiagramEditorUtil

+											.getSaveOptions());

+								}

+							}

+						} catch (IOException ex) {

+							throw new InvocationTargetException(ex,

+									"Save operation failed");

+						}

+					}

+				}.run(null);

+			} catch (InvocationTargetException e) {

+				throw new ExecutionException("Can't create diagram of '"

+						+ getDiagramKind() + "' kind", e);

+			} catch (InterruptedException e) {

+				throw new ExecutionException("Can't create diagram of '"

+						+ getDiagramKind() + "' kind", e);

+			}

+			return d;

+		}

+

+		/**

+		 * @generated

+		 */

+		protected EObject getDiagramDomainElement() {

+			// use same element as associated with EP

+			return ((View) diagramFacet.eContainer()).getElement();

+		}

+

+		/**

+		 * @generated

+		 */

+		protected PreferencesHint getPreferencesHint() {

+			// XXX prefhint from target diagram's editor?

+			return ComrelDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;

+		}

+

+		/**

+		 * @generated

+		 */

+		protected String getDiagramKind() {

+			return CompositeRefactoringEditPart.MODEL_ID;

+		}

+

+		/**

+		 * @generated

+		 */

+		protected String getEditorID() {

+			return ComrelDiagramEditor.ID;

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..7004e7d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit2CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3004SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort3EditPart.VISUAL_ID

+				|| visualID == MultiInputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3004SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ff2e522
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort2CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort3CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3004);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3005 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3006 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..c11cbb5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit3CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3036SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort3EditPart.VISUAL_ID

+				|| visualID == MultiInputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3036SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..5a48016
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort2CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort3CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3036);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3005 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3006 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..a2120d1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit4CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3037SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort3EditPart.VISUAL_ID

+				|| visualID == MultiInputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3037SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c114bec
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort2CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort3CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3037);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3005 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3006 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..8249316
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit5CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3043SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort3EditPart.VISUAL_ID

+				|| visualID == MultiInputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3043SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b0f7f6a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort2CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort3CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3043);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3005 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3006 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit6CanonicalEditPolicy.java
new file mode 100644
index 0000000..65a94f2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit6CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit6CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3045SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort3EditPart.VISUAL_ID

+				|| visualID == MultiInputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3045SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..06db209
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit6ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort2CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort3CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3045);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3005 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3006 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit7CanonicalEditPolicy.java
new file mode 100644
index 0000000..2762389
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit7CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit7CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3048SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort3EditPart.VISUAL_ID

+				|| visualID == MultiInputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_3048SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..1814b3c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnit7ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort2CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort3CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnit7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnit7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3048);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3005 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3006 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..ee39ed8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitCanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getParallelQueuedUnit_MultiInputPorts());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_2003SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort3EditPart.VISUAL_ID

+				|| visualID == MultiInputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnit_2003SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f7e25bb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort2CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort3CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_2003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3005 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3006 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit2EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit3EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..3e2ff32
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7023SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7023SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a2e4df7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3036);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3038 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3039 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3040 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3041 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..a1994bf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7025SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7025SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..46103ad
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3037);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3038 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3039 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3040 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3041 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..ed1f9c8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7029SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7029SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..37727a4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3043);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3038 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3039 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3040 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3041 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..5b80f6f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7033SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7033SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..69d6aac
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3045);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3038 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3039 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3040 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3041 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..eab2dd8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7041SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7041SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..667407f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3048);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3038 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3039 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3040 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3041 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..5d2c0eb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7075SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7075SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ade6088
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_2003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3038 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3039 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3040 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3041 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..885792f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7005SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7005SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..eb5a5e6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit2CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit2CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3004);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3038 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3039 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3040 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit2CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3041 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..6de5d0f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7024SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+		case SequentialUnit3EditPart.VISUAL_ID:

+		case ConditionalUnit3EditPart.VISUAL_ID:

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7024SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..18f5079
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit3CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit3CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3036);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3007 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3037 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3042 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3044 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3046 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3049 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..20ebbd4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7026SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+		case SequentialUnit3EditPart.VISUAL_ID:

+		case ConditionalUnit3EditPart.VISUAL_ID:

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7026SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d2ac1bb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit3CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit3CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3037);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3007 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3037 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3042 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3044 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3046 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3049 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..068a1ec
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7030SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+		case SequentialUnit3EditPart.VISUAL_ID:

+		case ConditionalUnit3EditPart.VISUAL_ID:

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7030SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..5d20d87
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit3CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit3CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3043);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3007 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3037 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3042 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3044 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3046 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3049 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..279b919
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7034SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+		case SequentialUnit3EditPart.VISUAL_ID:

+		case ConditionalUnit3EditPart.VISUAL_ID:

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7034SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a22a109
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit3CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit3CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3045);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3007 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3037 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3042 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3044 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3046 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3049 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..e747678
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7042SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+		case SequentialUnit3EditPart.VISUAL_ID:

+		case ConditionalUnit3EditPart.VISUAL_ID:

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7042SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8c1b8f8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit3CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit3CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3048);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3007 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3037 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3042 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3044 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3046 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3049 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..170dce9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7076SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+		case SequentialUnit3EditPart.VISUAL_ID:

+		case ConditionalUnit3EditPart.VISUAL_ID:

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7076SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b812fb1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit3CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit3CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_2003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3007 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3037 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3042 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3044 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3046 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3049 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..2f888a2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getParallelQueuedUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7006SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+		case SequentialUnit3EditPart.VISUAL_ID:

+		case ConditionalUnit3EditPart.VISUAL_ID:

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7006SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..9953bc3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit3CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit3CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit3CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit3CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit3CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.ParallelQueuedUnit_3004);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3007 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3037 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3042 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3044 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3046 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit3CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3049 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit3CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..50993b1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit2CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3026SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort7EditPart.VISUAL_ID

+				|| visualID == MultiInputPort8EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3026SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8a09c46
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort8CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort7CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3026);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3027 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort7CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3028 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort8CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..f468e5a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit3CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3044SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort7EditPart.VISUAL_ID

+				|| visualID == MultiInputPort8EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3044SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..69f4050
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort8CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort7CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3044);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3027 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort7CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3028 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort8CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..74abb67
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit4CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3060SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort7EditPart.VISUAL_ID

+				|| visualID == MultiInputPort8EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3060SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..19d7c44
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort8CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort7CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3060);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3027 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort7CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3028 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort8CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..4b15f52
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit5CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3069SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort7EditPart.VISUAL_ID

+				|| visualID == MultiInputPort8EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3069SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c97b33e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort8CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort7CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3069);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3027 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort7CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3028 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort8CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit6CanonicalEditPolicy.java
new file mode 100644
index 0000000..ab6edab
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit6CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit6CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3070SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort7EditPart.VISUAL_ID

+				|| visualID == MultiInputPort8EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3070SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..1fd4707
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit6ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort8CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort7CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnit6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3070);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3027 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort7CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3028 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort8CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit7CanonicalEditPolicy.java
new file mode 100644
index 0000000..9678873
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit7CanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnit7CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3073SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort7EditPart.VISUAL_ID

+				|| visualID == MultiInputPort8EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_3073SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0db2451
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnit7ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort8CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort7CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnit7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnit7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3073);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3027 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort7CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3028 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort8CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..f3e3536
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitCanonicalEditPolicy.java
@@ -0,0 +1,164 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_InputPorts();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_2005SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort7EditPart.VISUAL_ID

+				|| visualID == MultiInputPort8EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnit_2005SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a19b6f4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort8CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort7CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart;

+import comrel.diagram.edit.parts.SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_2005);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3027 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort7CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3028 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort8CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort8EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit6EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..98ed5dd
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7031SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7031SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..e34b87b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3044);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3061 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3062 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3063 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3064 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..f160cb0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7047SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7047SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..5dc2331
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3060);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3061 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3062 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3063 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3064 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..f2e74e1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7057SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7057SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b1a98dc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3069);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3061 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3062 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3063 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3064 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..8137521
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7059SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7059SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..646ce65
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3070);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3061 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3062 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3063 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3064 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..57a2d30
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7069SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7069SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..fa00595
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3073);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3061 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3062 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3063 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3064 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..00adf44
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7079SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7079SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ea5fd1d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_2005);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3061 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3062 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3063 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3064 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..c66121d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7013SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitHelperUnitsCompartment_7013SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..849ae1b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit5CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitHelperUnitsCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitHelperUnitsCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3026);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3061 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3062 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3063 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3064 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..f1bf018
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7032SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+		case SequentialUnit6EditPart.VISUAL_ID:

+		case ConditionalUnit5EditPart.VISUAL_ID:

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7032SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d64d4ef
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit5CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit5CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit6CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit6CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3044);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3029 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3045 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3065 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3070 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3071 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3074 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..a13d7a1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7048SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+		case SequentialUnit6EditPart.VISUAL_ID:

+		case ConditionalUnit5EditPart.VISUAL_ID:

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7048SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a1456f2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit5CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit5CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit6CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit6CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3060);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3029 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3045 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3065 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3070 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3071 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3074 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..0dd6852
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7058SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+		case SequentialUnit6EditPart.VISUAL_ID:

+		case ConditionalUnit5EditPart.VISUAL_ID:

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7058SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d522a4d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit5CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit5CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit6CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit6CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3069);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3029 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3045 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3065 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3070 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3071 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3074 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..00004f8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7060SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+		case SequentialUnit6EditPart.VISUAL_ID:

+		case ConditionalUnit5EditPart.VISUAL_ID:

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7060SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0480158
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit5CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit5CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit6CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit6CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3070);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3029 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3045 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3065 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3070 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3071 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3074 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..e9614ab
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7070SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+		case SequentialUnit6EditPart.VISUAL_ID:

+		case ConditionalUnit5EditPart.VISUAL_ID:

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7070SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c535cda
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit5CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit5CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit6CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit6CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3073);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3029 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3045 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3065 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3070 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3071 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3074 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..fa21611
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7080SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+		case SequentialUnit6EditPart.VISUAL_ID:

+		case ConditionalUnit5EditPart.VISUAL_ID:

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7080SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..9704343
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit5CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit5CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit6CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit6CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_2005);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3029 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3045 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3065 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3070 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3071 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3074 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..6d899e4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSequentialUnit_RefactoringUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7014SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+		case SequentialUnit6EditPart.VISUAL_ID:

+		case ConditionalUnit5EditPart.VISUAL_ID:

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7014SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..3ce3284
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SequentialUnitSequentialUnitRefactoringUnitsCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit5CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit5CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit6CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit6CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit6CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SequentialUnitSequentialUnitRefactoringUnitsCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SequentialUnitSequentialUnitRefactoringUnitsCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SequentialUnit_3026);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3029 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3045 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3065 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3070 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit6CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3071 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3074 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit5CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..70cc6b3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit2CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3038SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiInputPort3EditPart.VISUAL_ID

+				|| visualID == SingleOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3038SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4acac9b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,188 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort3CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort4CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPortCreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFeatureUnit_3038);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3009 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3010 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3011 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..f5d079c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit3CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3050SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiInputPort3EditPart.VISUAL_ID

+				|| visualID == SingleOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3050SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4ed6634
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,188 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort3CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort4CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPortCreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFeatureUnit_3050);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3009 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3010 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3011 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..3a07f92
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit4CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3055SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiInputPort3EditPart.VISUAL_ID

+				|| visualID == SingleOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3055SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..394251f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,188 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort3CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort4CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPortCreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFeatureUnit_3055);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3009 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3010 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3011 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..763bfcb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit5CanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3061SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiInputPort3EditPart.VISUAL_ID

+				|| visualID == SingleOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3061SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..384ba89
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,188 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort3CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort4CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPortCreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFeatureUnit_3061);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3009 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3010 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3011 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..fc0f44d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnitCanonicalEditPolicy.java
@@ -0,0 +1,182 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_SecondaryInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFeatureUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3008SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort4EditPart.VISUAL_ID

+				|| visualID == MultiInputPort3EditPart.VISUAL_ID

+				|| visualID == SingleOutputPortEditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFeatureUnit_3008SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8cf3ded
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFeatureUnitItemSemanticEditPolicy.java
@@ -0,0 +1,188 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort3CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort4CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPortCreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFeatureUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFeatureUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFeatureUnit_3008);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3009 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3010 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort3CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3011 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort4EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort3EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPortEditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..fb6dc87
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit2CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3040SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort5EditPart.VISUAL_ID

+				|| visualID == SingleOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3040SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a93dec7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,145 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort5CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFilterUnit_3040);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3017 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3018 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..b12a39f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit3CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3052SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort5EditPart.VISUAL_ID

+				|| visualID == SingleOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3052SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..7ae7f9e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,145 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort5CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFilterUnit_3052);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3017 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3018 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..0afe8c8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit4CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3057SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort5EditPart.VISUAL_ID

+				|| visualID == SingleOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3057SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d863b75
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,145 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort5CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFilterUnit_3057);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3017 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3018 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..32802e4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit5CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3063SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort5EditPart.VISUAL_ID

+				|| visualID == SingleOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3063SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b5ca24a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,145 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort5CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFilterUnit_3063);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3017 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3018 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..280ec6d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnitCanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_InputPort());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleFilterUnit_OutputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3016SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == MultiInputPort5EditPart.VISUAL_ID

+				|| visualID == SingleOutputPort2EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleFilterUnit_3016SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d2334e2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleFilterUnitItemSemanticEditPolicy.java
@@ -0,0 +1,145 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort5CreateCommand;

+import comrel.diagram.edit.commands.SingleOutputPort2CreateCommand;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleFilterUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleFilterUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleFilterUnit_3016);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.MultiInputPort_3017 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleOutputPort_3018 == req.getElementType()) {

+			return getGEFWrapper(new SingleOutputPort2CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case MultiInputPort5EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleOutputPort2EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..4a56c40
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort2ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3001);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..591c7e0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort3ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3005);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..56f7be3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort4ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3009);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c237f71
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort5ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3013);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..514ec26
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort6ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3023);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8642449
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort7ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3027);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort8ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort8ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..480d4df
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort8ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort8ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort8ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3031);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort9ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort9ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f506bfc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPort9ItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPort9ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPort9ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_3035);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPortItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPortItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d4a80c9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleInputPortItemSemanticEditPolicy.java
@@ -0,0 +1,148 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiSinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.MultiSinglePortMappingReorientCommand;

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleInputPortItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleInputPortItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleInputPort_2001);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

+			Edge incomingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+			if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						incomingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+				continue;

+			}

+		}

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		if (ComrelElementTypes.MultiSinglePortMapping_4003 == req

+				.getElementType()) {

+			return getGEFWrapper(new MultiSinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new MultiSinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleOutputPort2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleOutputPort2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..bd72892
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleOutputPort2ItemSemanticEditPolicy.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleOutputPort2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPort2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleOutputPort_3018);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleOutputPortItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleOutputPortItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c068238
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleOutputPortItemSemanticEditPolicy.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+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.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.SinglePortMappingCreateCommand;

+import comrel.diagram.edit.commands.SinglePortMappingReorientCommand;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleOutputPortItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleOutputPortItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleOutputPort_3011);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

+			Edge outgoingLink = (Edge) it.next();

+			if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+				DestroyElementRequest r = new DestroyElementRequest(

+						outgoingLink.getElement(), false);

+				cmd.add(new DestroyElementCommand(r));

+				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+				continue;

+			}

+		}

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)

+				: getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super

+				.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return getGEFWrapper(new SinglePortMappingCreateCommand(req,

+					req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(

+			CreateRelationshipRequest req) {

+		if (ComrelElementTypes.SinglePortMapping_4001 == req.getElementType()) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(

+			ReorientRelationshipRequest req) {

+		switch (getVisualID(req)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getGEFWrapper(new SinglePortMappingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SinglePortMappingItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SinglePortMappingItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8f11ed0
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SinglePortMappingItemSemanticEditPolicy.java
@@ -0,0 +1,32 @@
+/*

+ * 

+ */

+package comrel.diagram.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;

+

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SinglePortMappingItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SinglePortMappingItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SinglePortMapping_4001);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		return getGEFWrapper(new DestroyElementCommand(req));

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit2CanonicalEditPolicy.java
new file mode 100644
index 0000000..57ddb6b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit2CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit2CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_MultiInputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3022SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiInputPort7EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3022SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..d2726f7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit2ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort7CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort6CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit2ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3022);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3023 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3024 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit3CanonicalEditPolicy.java
new file mode 100644
index 0000000..ae78231
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit3CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit3CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_MultiInputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3042SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiInputPort7EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3042SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..66f2cc4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit3ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort7CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort6CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit3ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3042);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3023 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3024 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit4CanonicalEditPolicy.java
new file mode 100644
index 0000000..9b7a0bf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit4CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit4CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_MultiInputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3054SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiInputPort7EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3054SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..49f5000
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit4ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort7CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort6CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit4ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3054);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3023 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3024 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit5CanonicalEditPolicy.java
new file mode 100644
index 0000000..4128238
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit5CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit5CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_MultiInputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3059SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiInputPort7EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3059SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b1572db
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit5ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort7CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort6CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit5ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3059);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3023 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3024 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit6CanonicalEditPolicy.java
new file mode 100644
index 0000000..22fe96f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit6CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit6CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_MultiInputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3065SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiInputPort7EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3065SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..0f473d2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit6ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort7CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort6CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit6ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3065);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3023 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3024 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit7CanonicalEditPolicy.java
new file mode 100644
index 0000000..a1f4cd6
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit7CanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit7CanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_MultiInputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3067SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiInputPort7EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_3067SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..abad04f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnit7ItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort7CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort6CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnit7ItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnit7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3067);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3023 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3024 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitCanonicalEditPolicy.java
new file mode 100644
index 0000000..7fff04c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitCanonicalEditPolicy.java
@@ -0,0 +1,178 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

+	protected Set getFeaturesToSynchronize() {

+		if (myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_SingleInputPorts());

+			myFeaturesToSynchronize.add(ComrelPackage.eINSTANCE

+					.getSingleQueuedUnit_MultiInputPort());

+		}

+		return myFeaturesToSynchronize;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_2004SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		return visualID == SingleInputPort6EditPart.VISUAL_ID

+				|| visualID == MultiInputPort7EditPart.VISUAL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnit_2004SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitItemSemanticEditPolicy.java
new file mode 100644
index 0000000..120565a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitItemSemanticEditPolicy.java
@@ -0,0 +1,263 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.commands.MultiInputPort7CreateCommand;

+import comrel.diagram.edit.commands.SingleInputPort6CreateCommand;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitItemSemanticEditPolicy extends

+		ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_2004);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleInputPort_3023 == req.getElementType()) {

+			return getGEFWrapper(new SingleInputPort6CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiInputPort_3024 == req.getElementType()) {

+			return getGEFWrapper(new MultiInputPort7CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View) getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(

+				getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(false);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if (annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			cmd.add(new DestroyElementCommand(req));

+		} else {

+			cmd.add(new DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View) getHost().getModel();

+		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node) nit.next();

+			switch (ComrelVisualIDRegistry.getVisualID(node)) {

+			case SingleInputPort6EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == SinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case MultiInputPort7EditPart.VISUAL_ID:

+				for (Iterator<?> it = node.getTargetEdges().iterator(); it

+						.hasNext();) {

+					Edge incomingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(incomingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								incomingLink));

+						continue;

+					}

+				}

+				for (Iterator<?> it = node.getSourceEdges().iterator(); it

+						.hasNext();) {

+					Edge outgoingLink = (Edge) it.next();

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiPortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+					if (ComrelVisualIDRegistry.getVisualID(outgoingLink) == MultiSinglePortMappingEditPart.VISUAL_ID) {

+						DestroyElementRequest r = new DestroyElementRequest(

+								outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(r));

+						cmd.add(new DeleteCommand(getEditingDomain(),

+								outgoingLink));

+						continue;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(

+						getEditingDomain(), node.getElement(), false))); // directlyOwned: true

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case SingleFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFeatureUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case MultiFilterUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+				for (Iterator<?> cit = node.getChildren().iterator(); cit

+						.hasNext();) {

+					Node cnode = (Node) cit.next();

+					switch (ComrelVisualIDRegistry.getVisualID(cnode)) {

+					case CartesianQueuedUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ParallelQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SingleQueuedUnit5EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case SequentialUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case ConditionalUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					case AtomicUnit4EditPart.VISUAL_ID:

+						cmd.add(new DestroyElementCommand(

+								new DestroyElementRequest(getEditingDomain(),

+										cnode.getElement(), false))); // directlyOwned: true

+						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

+						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

+						break;

+					}

+				}

+				break;

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..265332a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7027SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7027SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..ce6013b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3042);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3055 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3056 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3057 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3058 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..c96847d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7043SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7043SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..1712e54
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3054);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3055 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3056 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3057 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3058 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..ce479bc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7045SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7045SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..47f5958
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3059);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3055 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3056 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3057 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3058 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..8dc0b48
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7049SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7049SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a252c92
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3065);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3055 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3056 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3057 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3058 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..0d9749a
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7055SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7055SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..a6b04d5
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3067);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3055 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3056 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3057 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3058 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..1bded96
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7077SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7077SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..283cf30
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_2004);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3055 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3056 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3057 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3058 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..79ee817
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,173 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_HelperUnits();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7009SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7009SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..fd1bf50
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,47 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.MultiFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.MultiFilterUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFeatureUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleFilterUnit4CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3022);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.SingleFeatureUnit_3055 == req.getElementType()) {

+			return getGEFWrapper(new SingleFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFeatureUnit_3056 == req.getElementType()) {

+			return getGEFWrapper(new MultiFeatureUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleFilterUnit_3057 == req.getElementType()) {

+			return getGEFWrapper(new SingleFilterUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.MultiFilterUnit_3058 == req.getElementType()) {

+			return getGEFWrapper(new MultiFilterUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy.java
new file mode 100644
index 0000000..3bdd6da
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7028SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+		case SequentialUnit4EditPart.VISUAL_ID:

+		case ConditionalUnit4EditPart.VISUAL_ID:

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7028SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..c75edd8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit4CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit4CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3042);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3025 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3043 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3059 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3060 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3066 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3068 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy.java
new file mode 100644
index 0000000..1f1277e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7044SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+		case SequentialUnit4EditPart.VISUAL_ID:

+		case ConditionalUnit4EditPart.VISUAL_ID:

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7044SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..78982a3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit4CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit4CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3054);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3025 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3043 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3059 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3060 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3066 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3068 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy.java
new file mode 100644
index 0000000..0ea4a23
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7046SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+		case SequentialUnit4EditPart.VISUAL_ID:

+		case ConditionalUnit4EditPart.VISUAL_ID:

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7046SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..b0b395c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit4CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit4CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3059);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3025 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3043 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3059 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3060 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3066 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3068 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy.java
new file mode 100644
index 0000000..85f8651
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7050SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+		case SequentialUnit4EditPart.VISUAL_ID:

+		case ConditionalUnit4EditPart.VISUAL_ID:

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7050SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..f05e578
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit4CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit4CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3065);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3025 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3043 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3059 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3060 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3066 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3068 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy.java
new file mode 100644
index 0000000..ca5acb8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7056SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+		case SequentialUnit4EditPart.VISUAL_ID:

+		case ConditionalUnit4EditPart.VISUAL_ID:

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7056SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..8995d26
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit4CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit4CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3067);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3025 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3043 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3059 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3060 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3066 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3068 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy.java
new file mode 100644
index 0000000..f0802e2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7CanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7078SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+		case SequentialUnit4EditPart.VISUAL_ID:

+		case ConditionalUnit4EditPart.VISUAL_ID:

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7078SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy.java
new file mode 100644
index 0000000..2b6d2aa
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit4CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit4CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7ItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_2004);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3025 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3043 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3059 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3060 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3066 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3068 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy.java
new file mode 100644
index 0000000..c4ac185
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy.java
@@ -0,0 +1,177 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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.commands.SetViewMutabilityCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.part.ComrelDiagramUpdater;

+import comrel.diagram.part.ComrelNodeDescriptor;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentCanonicalEditPolicy

+		extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return ComrelPackage.eINSTANCE.getSingleQueuedUnit_RefactoringUnit();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View) getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7010SemanticChildren(viewObject);

+		for (ComrelNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren,

+			final View view) {

+		return isMyDiagramElement(view)

+				&& !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		int visualID = ComrelVisualIDRegistry.getVisualID(view);

+		switch (visualID) {

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+		case SequentialUnit4EditPart.VISUAL_ID:

+		case ConditionalUnit4EditPart.VISUAL_ID:

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if (resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<ComrelNodeDescriptor> childDescriptors = ComrelDiagramUpdater

+				.getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7010SemanticChildren((View) getHost()

+						.getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for (View v : getViewChildren()) {

+			if (isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for (Iterator<ComrelNodeDescriptor> descriptorsIterator = childDescriptors

+				.iterator(); descriptorsIterator.hasNext();) {

+			ComrelNodeDescriptor next = descriptorsIterator.next();

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for (View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if (next.getModelElement().equals(semanticElement)) {

+					if (hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if (perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(

+				childDescriptors.size());

+		for (ComrelNodeDescriptor next : childDescriptors) {

+			String hint = ComrelVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(

+					next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(

+					elementAdapter, Node.class, hint, ViewUtil.APPEND, false,

+					host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if (cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(

+					new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if (changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if (createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()

+					.getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 0000000..bcb3953
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/edit/policies/SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,55 @@
+/*

+ * 

+ */

+package comrel.diagram.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+

+import comrel.diagram.edit.commands.AtomicUnit4CreateCommand;

+import comrel.diagram.edit.commands.CartesianQueuedUnit4CreateCommand;

+import comrel.diagram.edit.commands.ConditionalUnit4CreateCommand;

+import comrel.diagram.edit.commands.ParallelQueuedUnit5CreateCommand;

+import comrel.diagram.edit.commands.SequentialUnit4CreateCommand;

+import comrel.diagram.edit.commands.SingleQueuedUnit5CreateCommand;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy

+		extends ComrelBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentItemSemanticEditPolicy() {

+		super(ComrelElementTypes.SingleQueuedUnit_3022);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if (ComrelElementTypes.CartesianQueuedUnit_3025 == req.getElementType()) {

+			return getGEFWrapper(new CartesianQueuedUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ParallelQueuedUnit_3043 == req.getElementType()) {

+			return getGEFWrapper(new ParallelQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SingleQueuedUnit_3059 == req.getElementType()) {

+			return getGEFWrapper(new SingleQueuedUnit5CreateCommand(req));

+		}

+		if (ComrelElementTypes.SequentialUnit_3060 == req.getElementType()) {

+			return getGEFWrapper(new SequentialUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.ConditionalUnit_3066 == req.getElementType()) {

+			return getGEFWrapper(new ConditionalUnit4CreateCommand(req));

+		}

+		if (ComrelElementTypes.AtomicUnit_3068 == req.getElementType()) {

+			return getGEFWrapper(new AtomicUnit4CreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/expressions/ComrelAbstractExpression.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/expressions/ComrelAbstractExpression.java
new file mode 100644
index 0000000..97bc394
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/expressions/ComrelAbstractExpression.java
@@ -0,0 +1,161 @@
+/*

+ * 

+ */

+package comrel.diagram.expressions;

+

+import java.math.BigDecimal;

+import java.math.BigInteger;

+import java.util.Collections;

+import java.util.Map;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+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.util.EcoreUtil;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public abstract class ComrelAbstractExpression {

+

+	/**

+	 * @generated

+	 */

+	private IStatus status = Status.OK_STATUS;

+

+	/**

+	 * @generated

+	 */

+	protected void setStatus(int severity, String message, Throwable throwable) {

+		String pluginID = ComrelDiagramEditorPlugin.ID;

+		this.status = new Status(severity, pluginID, -1,

+				(message != null) ? message : "", throwable); //$NON-NLS-1$

+		if (!this.status.isOK()) {

+			ComrelDiagramEditorPlugin

+					.getInstance()

+					.logError(

+							"Expression problem:" + message + "body:" + body(), throwable); //$NON-NLS-1$ //$NON-NLS-2$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public IStatus getStatus() {

+		return status;

+	}

+

+	/**

+	 * @generated

+	 */

+	private final String myBody;

+

+	/**

+	 * @generated

+	 */

+	public String body() {

+		return myBody;

+	}

+

+	/**

+	 * @generated

+	 */

+	private final EClassifier myContext;

+

+	/**

+	 * @generated

+	 */

+	public EClassifier context() {

+		return myContext;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ComrelAbstractExpression(String body, EClassifier context) {

+		myBody = body;

+		myContext = context;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected abstract Object doEvaluate(Object context, Map env);

+

+	/**

+	 * @generated

+	 */

+	public Object evaluate(Object context) {

+		return evaluate(context, Collections.EMPTY_MAP);

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	public Object evaluate(Object context, Map env) {

+		if (context().isInstance(context)) {

+			try {

+				return doEvaluate(context, env);

+			} catch (Exception e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Expression evaluation failure: " + body(), e); //$NON-NLS-1$

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Expression may return number value which is not directly compatible with feature type (e.g. Double when Integer is expected), or EEnumLiteral meta-object when literal instance is expected

+	 * @generated

+	 */

+	public static Object performCast(Object value, EDataType targetType) {

+		if (targetType instanceof EEnum) {

+			if (value instanceof EEnumLiteral) {

+				EEnumLiteral literal = (EEnumLiteral) value;

+				return (literal.getInstance() != null) ? literal.getInstance()

+						: literal;

+			}

+		}

+		if (false == value instanceof Number || targetType == null

+				|| targetType.getInstanceClass() == null) {

+			return value;

+		}

+		Class<?> targetClass = targetType.getInstanceClass();

+		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;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/expressions/ComrelOCLFactory.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/expressions/ComrelOCLFactory.java
new file mode 100644
index 0000000..a1df11f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/expressions/ComrelOCLFactory.java
@@ -0,0 +1,174 @@
+/*

+ * 

+ */

+package comrel.diagram.expressions;

+

+import java.util.Collections;

+import java.util.Map;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.EParameter;

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.ocl.Environment;

+import org.eclipse.ocl.EvaluationEnvironment;

+import org.eclipse.ocl.ParserException;

+import org.eclipse.ocl.ecore.EcoreFactory;

+import org.eclipse.ocl.ecore.OCLExpression;

+import org.eclipse.ocl.ecore.Variable;

+import org.eclipse.ocl.ecore.OCL.Helper;

+import org.eclipse.ocl.options.ParsingOptions;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class ComrelOCLFactory {

+

+	/**

+	 * @generated

+	 */

+	private final ComrelAbstractExpression[] expressions;

+

+	/**

+	 * @generated

+	 */

+	protected ComrelOCLFactory() {

+		this.expressions = new ComrelAbstractExpression[3];

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ComrelAbstractExpression getExpression(int index,

+			EClassifier context, Map<String, EClassifier> environment) {

+		ComrelOCLFactory cached = ComrelDiagramEditorPlugin.getInstance()

+				.getComrelOCLFactory();

+		if (cached == null) {

+			ComrelDiagramEditorPlugin.getInstance().setComrelOCLFactory(

+					cached = new ComrelOCLFactory());

+		}

+		if (index < 0 || index >= cached.expressions.length) {

+			throw new IllegalArgumentException();

+		}

+		if (cached.expressions[index] == null) {

+			final String[] exprBodies = new String[] { "self<>oppositeEnd", //$NON-NLS-1$

+					"self<>oppositeEnd", //$NON-NLS-1$

+					"self<>oppositeEnd", //$NON-NLS-1$

+			};

+			cached.expressions[index] = getExpression(

+					exprBodies[index],

+					context,

+					environment == null ? Collections

+							.<String, EClassifier> emptyMap() : environment);

+		}

+		return cached.expressions[index];

+	}

+

+	/**

+	 * This is factory method, callers are responsible to keep reference to the return value if they want to reuse parsed expression

+	 * @generated

+	 */

+	public static ComrelAbstractExpression getExpression(String body,

+			EClassifier context, Map<String, EClassifier> environment) {

+		return new Expression(body, context, environment);

+	}

+

+	/**

+	 * This method will become private in the next release

+	 * @generated

+	 */

+	public static ComrelAbstractExpression getExpression(String body,

+			EClassifier context) {

+		return getExpression(body, context,

+				Collections.<String, EClassifier> emptyMap());

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class Expression extends ComrelAbstractExpression {

+

+		/**

+		 * @generated

+		 */

+		private final org.eclipse.ocl.ecore.OCL oclInstance;

+

+		/**

+		 * @generated

+		 */

+		private OCLExpression oclExpression;

+

+		/**

+		 * @generated

+		 */

+		public Expression(String body, EClassifier context,

+				Map<String, EClassifier> environment) {

+			super(body, context);

+			oclInstance = org.eclipse.ocl.ecore.OCL.newInstance();

+			initCustomEnv(oclInstance.getEnvironment(), environment);

+			Helper oclHelper = oclInstance.createOCLHelper();

+			oclHelper.setContext(context());

+			try {

+				oclExpression = oclHelper.createQuery(body());

+				setStatus(IStatus.OK, null, null);

+			} catch (ParserException e) {

+				setStatus(IStatus.ERROR, e.getMessage(), e);

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		@SuppressWarnings("rawtypes")

+		protected Object doEvaluate(Object context, Map env) {

+			if (oclExpression == null) {

+				return null;

+			}

+			// on the first call, both evalEnvironment and extentMap are clear, for later we have finally, below.

+			EvaluationEnvironment<?, ?, ?, ?, ?> evalEnv = oclInstance

+					.getEvaluationEnvironment();

+			// initialize environment

+			for (Object nextKey : env.keySet()) {

+				evalEnv.replace((String) nextKey, env.get(nextKey));

+			}

+			try {

+				Object result = oclInstance.evaluate(context, oclExpression);

+				return oclInstance.isInvalid(result) ? null : result;

+			} finally {

+				evalEnv.clear();

+				oclInstance.setExtentMap(null); // clear allInstances cache, and get the oclInstance ready for the next call

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		private static void initCustomEnv(

+				Environment<?, EClassifier, ?, ?, ?, EParameter, ?, ?, ?, ?, ?, ?> ecoreEnv,

+				Map<String, EClassifier> environment) {

+			// Use EObject as implicit root class for any object, to allow eContainer() and other EObject operations from OCL expressions

+			ParsingOptions.setOption(ecoreEnv,

+					ParsingOptions.implicitRootClass(ecoreEnv),

+					EcorePackage.eINSTANCE.getEObject());

+			for (String varName : environment.keySet()) {

+				EClassifier varType = environment.get(varName);

+				ecoreEnv.addElement(varName,

+						createVar(ecoreEnv, varName, varType), false);

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		private static Variable createVar(

+				Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> ecoreEnv,

+				String name, EClassifier type) {

+			Variable var = EcoreFactory.eINSTANCE.createVariable();

+			var.setName(name);

+			var.setType(ecoreEnv.getUMLReflection().getOCLType(type));

+			return var;

+		}

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/layoutprovider/CompositeRefactoringDefaultLayoutProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/layoutprovider/CompositeRefactoringDefaultLayoutProvider.java
new file mode 100644
index 0000000..144b871
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/layoutprovider/CompositeRefactoringDefaultLayoutProvider.java
@@ -0,0 +1,38 @@
+package comrel.diagram.layoutprovider;

+

+import java.util.Iterator;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.diagram.ui.providers.LeftRightProvider;

+import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode;

+import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeOperation;

+import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+

+public class CompositeRefactoringDefaultLayoutProvider extends LeftRightProvider {

+    public static String DEFAULT_LAYOUT = "Default";

+

+    public boolean provides(IOperation operation) {

+        // enable this provider only on mindmap diagrams

+        if (operation instanceof ILayoutNodeOperation) {

+            Iterator nodes = ((ILayoutNodeOperation) operation)

+                .getLayoutNodes().listIterator();

+            if (nodes.hasNext()) {

+                View node = ((ILayoutNode) nodes.next()).getNode();

+                Diagram container = node.getDiagram();

+                if (container == null

+                    || !(container.getType().equals("Mindmap"))) //$NON-NLS-1$

+                    return false;

+            }

+        } else {

+            return false;

+        }

+        IAdaptable layoutHint = ((ILayoutNodeOperation) operation)

+            .getLayoutHint();

+        String layoutType = (String) layoutHint.getAdapter(String.class);

+        return LayoutType.DEFAULT.equals(layoutType);

+    }

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelAbstractNavigatorItem.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelAbstractNavigatorItem.java
new file mode 100644
index 0000000..fd67796
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelAbstractNavigatorItem.java
@@ -0,0 +1,61 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.core.runtime.IAdapterFactory;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.core.runtime.PlatformObject;

+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;

+

+/**

+ * @generated

+ */

+public abstract class ComrelAbstractNavigatorItem extends PlatformObject {

+

+	/**

+	 * @generated

+	 */

+	static {

+		final Class[] supportedTypes = new Class[] { ITabbedPropertySheetPageContributor.class };

+		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {

+			public String getContributorId() {

+				return "comrel.diagram"; //$NON-NLS-1$

+			}

+		};

+		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

+

+			public Object getAdapter(Object adaptableObject, Class adapterType) {

+				if (adaptableObject instanceof comrel.diagram.navigator.ComrelAbstractNavigatorItem

+						&& adapterType == ITabbedPropertySheetPageContributor.class) {

+					return propertySheetPageContributor;

+				}

+				return null;

+			}

+

+			public Class[] getAdapterList() {

+				return supportedTypes;

+			}

+		}, comrel.diagram.navigator.ComrelAbstractNavigatorItem.class);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Object myParent;

+

+	/**

+	 * @generated

+	 */

+	protected ComrelAbstractNavigatorItem(Object parent) {

+		myParent = parent;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object getParent() {

+		return myParent;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorContentProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorContentProvider.java
new file mode 100644
index 0000000..d2a535d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorContentProvider.java
@@ -0,0 +1,233 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashMap;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.ui.IMemento;

+import org.eclipse.ui.navigator.ICommonContentExtensionSite;

+import org.eclipse.ui.navigator.ICommonContentProvider;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class ComrelDomainNavigatorContentProvider implements

+		ICommonContentProvider {

+

+	/**

+	 * @generated

+	 */

+	private AdapterFactoryContentProvider myAdapterFctoryContentProvier;

+

+	/**

+	 * @generated

+	 */

+	private static final Object[] EMPTY_ARRAY = new Object[0];

+

+	/**

+	 * @generated

+	 */

+	private Viewer myViewer;

+

+	/**

+	 * @generated

+	 */

+	private AdapterFactoryEditingDomain myEditingDomain;

+

+	/**

+	 * @generated

+	 */

+	private WorkspaceSynchronizer myWorkspaceSynchronizer;

+

+	/**

+	 * @generated

+	 */

+	private Runnable myViewerRefreshRunnable;

+

+	/**

+	 * @generated

+	 */

+	public ComrelDomainNavigatorContentProvider() {

+		myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(

+				ComrelDiagramEditorPlugin.getInstance()

+						.getItemProvidersAdapterFactory());

+		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE

+				.createEditingDomain();

+		myEditingDomain = (AdapterFactoryEditingDomain) editingDomain;

+		myEditingDomain.setResourceToReadOnlyMap(new HashMap() {

+			public Object get(Object key) {

+				if (!containsKey(key)) {

+					put(key, Boolean.TRUE);

+				}

+				return super.get(key);

+			}

+		});

+		myViewerRefreshRunnable = new Runnable() {

+			public void run() {

+				if (myViewer != null) {

+					myViewer.refresh();

+				}

+			}

+		};

+		myWorkspaceSynchronizer = new WorkspaceSynchronizer(editingDomain,

+				new WorkspaceSynchronizer.Delegate() {

+					public void dispose() {

+					}

+

+					public boolean handleResourceChanged(final Resource resource) {

+						unloadAllResources();

+						asyncRefresh();

+						return true;

+					}

+

+					public boolean handleResourceDeleted(Resource resource) {

+						unloadAllResources();

+						asyncRefresh();

+						return true;

+					}

+

+					public boolean handleResourceMoved(Resource resource,

+							final URI newURI) {

+						unloadAllResources();

+						asyncRefresh();

+						return true;

+					}

+				});

+	}

+

+	/**

+	 * @generated

+	 */

+	public void dispose() {

+		myWorkspaceSynchronizer.dispose();

+		myWorkspaceSynchronizer = null;

+		myViewerRefreshRunnable = null;

+		myViewer = null;

+		unloadAllResources();

+		((TransactionalEditingDomain) myEditingDomain).dispose();

+		myEditingDomain = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+		myViewer = viewer;

+	}

+

+	/**

+	 * @generated

+	 */

+	void unloadAllResources() {

+		for (Resource nextResource : myEditingDomain.getResourceSet()

+				.getResources()) {

+			nextResource.unload();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	void asyncRefresh() {

+		if (myViewer != null && !myViewer.getControl().isDisposed()) {

+			myViewer.getControl().getDisplay()

+					.asyncExec(myViewerRefreshRunnable);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object[] getElements(Object inputElement) {

+		return getChildren(inputElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void restoreState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void saveState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init(ICommonContentExtensionSite aConfig) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object[] getChildren(Object parentElement) {

+		if (parentElement instanceof IFile) {

+			IFile file = (IFile) parentElement;

+			URI fileURI = URI.createPlatformResourceURI(file.getFullPath()

+					.toString(), true);

+			Resource resource = myEditingDomain.getResourceSet().getResource(

+					fileURI, true);

+			return wrapEObjects(

+					myAdapterFctoryContentProvier.getChildren(resource),

+					parentElement);

+		}

+

+		if (parentElement instanceof ComrelDomainNavigatorItem) {

+			return wrapEObjects(

+					myAdapterFctoryContentProvier.getChildren(((ComrelDomainNavigatorItem) parentElement)

+							.getEObject()), parentElement);

+		}

+		return EMPTY_ARRAY;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object[] wrapEObjects(Object[] objects, Object parentElement) {

+		Collection result = new ArrayList();

+		for (int i = 0; i < objects.length; i++) {

+			if (objects[i] instanceof EObject) {

+				result.add(new ComrelDomainNavigatorItem((EObject) objects[i],

+						parentElement, myAdapterFctoryContentProvier));

+			}

+		}

+		return result.toArray();

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object getParent(Object element) {

+		if (element instanceof ComrelAbstractNavigatorItem) {

+			ComrelAbstractNavigatorItem abstractNavigatorItem = (ComrelAbstractNavigatorItem) element;

+			return abstractNavigatorItem.getParent();

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean hasChildren(Object element) {

+		return element instanceof IFile || getChildren(element).length > 0;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorItem.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorItem.java
new file mode 100644
index 0000000..130f676
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorItem.java
@@ -0,0 +1,116 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.core.runtime.IAdapterFactory;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.core.runtime.PlatformObject;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.ui.views.properties.IPropertySource;

+import org.eclipse.ui.views.properties.IPropertySourceProvider;

+

+/**

+ * @generated

+ */

+public class ComrelDomainNavigatorItem extends PlatformObject {

+

+	/**

+	 * @generated

+	 */

+	static {

+		final Class[] supportedTypes = new Class[] { EObject.class,

+				IPropertySource.class };

+		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

+

+			public Object getAdapter(Object adaptableObject, Class adapterType) {

+				if (adaptableObject instanceof comrel.diagram.navigator.ComrelDomainNavigatorItem) {

+					comrel.diagram.navigator.ComrelDomainNavigatorItem domainNavigatorItem = (comrel.diagram.navigator.ComrelDomainNavigatorItem) adaptableObject;

+					EObject eObject = domainNavigatorItem.getEObject();

+					if (adapterType == EObject.class) {

+						return eObject;

+					}

+					if (adapterType == IPropertySource.class) {

+						return domainNavigatorItem.getPropertySourceProvider()

+								.getPropertySource(eObject);

+					}

+				}

+

+				return null;

+			}

+

+			public Class[] getAdapterList() {

+				return supportedTypes;

+			}

+		}, comrel.diagram.navigator.ComrelDomainNavigatorItem.class);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Object myParent;

+

+	/**

+	 * @generated

+	 */

+	private EObject myEObject;

+

+	/**

+	 * @generated

+	 */

+	private IPropertySourceProvider myPropertySourceProvider;

+

+	/**

+	 * @generated

+	 */

+	public ComrelDomainNavigatorItem(EObject eObject, Object parent,

+			IPropertySourceProvider propertySourceProvider) {

+		myParent = parent;

+		myEObject = eObject;

+		myPropertySourceProvider = propertySourceProvider;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object getParent() {

+		return myParent;

+	}

+

+	/**

+	 * @generated

+	 */

+	public EObject getEObject() {

+		return myEObject;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IPropertySourceProvider getPropertySourceProvider() {

+		return myPropertySourceProvider;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean equals(Object obj) {

+		if (obj instanceof comrel.diagram.navigator.ComrelDomainNavigatorItem) {

+			return EcoreUtil

+					.getURI(getEObject())

+					.equals(EcoreUtil

+							.getURI(((comrel.diagram.navigator.ComrelDomainNavigatorItem) obj)

+									.getEObject()));

+		}

+		return super.equals(obj);

+	}

+

+	/**

+	 * @generated

+	 */

+	public int hashCode() {

+		return EcoreUtil.getURI(getEObject()).hashCode();

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorLabelProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorLabelProvider.java
new file mode 100644
index 0000000..c55e222
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelDomainNavigatorLabelProvider.java
@@ -0,0 +1,103 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.jface.viewers.ILabelProviderListener;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.IMemento;

+import org.eclipse.ui.navigator.ICommonContentExtensionSite;

+import org.eclipse.ui.navigator.ICommonLabelProvider;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class ComrelDomainNavigatorLabelProvider implements ICommonLabelProvider {

+

+	/**

+	 * @generated

+	 */

+	private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider(

+			ComrelDiagramEditorPlugin.getInstance()

+					.getItemProvidersAdapterFactory());

+

+	/**

+	 * @generated

+	 */

+	public void init(ICommonContentExtensionSite aConfig) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public Image getImage(Object element) {

+		if (element instanceof ComrelDomainNavigatorItem) {

+			return myAdapterFactoryLabelProvider

+					.getImage(((ComrelDomainNavigatorItem) element)

+							.getEObject());

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getText(Object element) {

+		if (element instanceof ComrelDomainNavigatorItem) {

+			return myAdapterFactoryLabelProvider

+					.getText(((ComrelDomainNavigatorItem) element).getEObject());

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void addListener(ILabelProviderListener listener) {

+		myAdapterFactoryLabelProvider.addListener(listener);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void dispose() {

+		myAdapterFactoryLabelProvider.dispose();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isLabelProperty(Object element, String property) {

+		return myAdapterFactoryLabelProvider.isLabelProperty(element, property);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void removeListener(ILabelProviderListener listener) {

+		myAdapterFactoryLabelProvider.removeListener(listener);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void restoreState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void saveState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getDescription(Object anElement) {

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorActionProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorActionProvider.java
new file mode 100644
index 0000000..d34e194
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorActionProvider.java
@@ -0,0 +1,180 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.common.ui.URIEditorInput;

+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.util.EcoreUtil;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.navigator.CommonActionProvider;

+import org.eclipse.ui.navigator.ICommonActionConstants;

+import org.eclipse.ui.navigator.ICommonActionExtensionSite;

+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;

+import org.eclipse.ui.part.FileEditorInput;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.part.ComrelDiagramEditor;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComrelNavigatorActionProvider extends CommonActionProvider {

+

+	/**

+	 * @generated

+	 */

+	private boolean myContribute;

+

+	/**

+	 * @generated

+	 */

+	private OpenDiagramAction myOpenDiagramAction;

+

+	/**

+	 * @generated

+	 */

+	public void init(ICommonActionExtensionSite aSite) {

+		super.init(aSite);

+		if (aSite.getViewSite() instanceof ICommonViewerWorkbenchSite) {

+			myContribute = true;

+			makeActions((ICommonViewerWorkbenchSite) aSite.getViewSite());

+		} else {

+			myContribute = false;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void makeActions(ICommonViewerWorkbenchSite viewerSite) {

+		myOpenDiagramAction = new OpenDiagramAction(viewerSite);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void fillActionBars(IActionBars actionBars) {

+		if (!myContribute) {

+			return;

+		}

+		IStructuredSelection selection = (IStructuredSelection) getContext()

+				.getSelection();

+		myOpenDiagramAction.selectionChanged(selection);

+		if (myOpenDiagramAction.isEnabled()) {

+			actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN,

+					myOpenDiagramAction);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void fillContextMenu(IMenuManager menu) {

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class OpenDiagramAction extends Action {

+

+		/**

+		 * @generated

+		 */

+		private Diagram myDiagram;

+

+		/**

+		 * @generated

+		 */

+		private ICommonViewerWorkbenchSite myViewerSite;

+

+		/**

+		 * @generated

+		 */

+		public OpenDiagramAction(ICommonViewerWorkbenchSite viewerSite) {

+			super(Messages.NavigatorActionProvider_OpenDiagramActionName);

+			myViewerSite = viewerSite;

+		}

+

+		/**

+		 * @generated

+		 */

+		public final void selectionChanged(IStructuredSelection selection) {

+			myDiagram = null;

+			if (selection.size() == 1) {

+				Object selectedElement = selection.getFirstElement();

+				if (selectedElement instanceof ComrelNavigatorItem) {

+					selectedElement = ((ComrelNavigatorItem) selectedElement)

+							.getView();

+				} else if (selectedElement instanceof IAdaptable) {

+					selectedElement = ((IAdaptable) selectedElement)

+							.getAdapter(View.class);

+				}

+				if (selectedElement instanceof Diagram) {

+					Diagram diagram = (Diagram) selectedElement;

+					if (CompositeRefactoringEditPart.MODEL_ID

+							.equals(ComrelVisualIDRegistry.getModelID(diagram))) {

+						myDiagram = diagram;

+					}

+				}

+			}

+			setEnabled(myDiagram != null);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void run() {

+			if (myDiagram == null || myDiagram.eResource() == null) {

+				return;

+			}

+

+			IEditorInput editorInput = getEditorInput(myDiagram);

+			IWorkbenchPage page = myViewerSite.getPage();

+			try {

+				page.openEditor(editorInput, ComrelDiagramEditor.ID);

+			} catch (PartInitException e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Exception while openning diagram", e); //$NON-NLS-1$

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		private static IEditorInput getEditorInput(Diagram diagram) {

+			Resource diagramResource = diagram.eResource();

+			for (EObject nextEObject : diagramResource.getContents()) {

+				if (nextEObject == diagram) {

+					return new FileEditorInput(

+							WorkspaceSynchronizer.getFile(diagramResource));

+				}

+				if (nextEObject instanceof Diagram) {

+					break;

+				}

+			}

+			URI uri = EcoreUtil.getURI(diagram);

+			String editorName = uri.lastSegment() + '#'

+					+ diagram.eResource().getContents().indexOf(diagram);

+			IEditorInput editorInput = new URIEditorInput(uri, editorName);

+			return editorInput;

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorContentProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorContentProvider.java
new file mode 100644
index 0000000..52559f8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorContentProvider.java
@@ -0,0 +1,6162 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+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 org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

+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.jface.viewers.Viewer;

+import org.eclipse.ui.IMemento;

+import org.eclipse.ui.navigator.ICommonContentExtensionSite;

+import org.eclipse.ui.navigator.ICommonContentProvider;

+

+import comrel.diagram.edit.parts.*;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComrelNavigatorContentProvider implements ICommonContentProvider {

+

+	/**

+	 * @generated

+	 */

+	private static final Object[] EMPTY_ARRAY = new Object[0];

+

+	/**

+	 * @generated

+	 */

+	private Viewer myViewer;

+

+	/**

+	 * @generated

+	 */

+	private AdapterFactoryEditingDomain myEditingDomain;

+

+	/**

+	 * @generated

+	 */

+	private WorkspaceSynchronizer myWorkspaceSynchronizer;

+

+	/**

+	 * @generated

+	 */

+	private Runnable myViewerRefreshRunnable;

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings({ "unchecked", "serial", "rawtypes" })

+	public ComrelNavigatorContentProvider() {

+		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE

+				.createEditingDomain();

+		myEditingDomain = (AdapterFactoryEditingDomain) editingDomain;

+		myEditingDomain.setResourceToReadOnlyMap(new HashMap() {

+			public Object get(Object key) {

+				if (!containsKey(key)) {

+					put(key, Boolean.TRUE);

+				}

+				return super.get(key);

+			}

+		});

+		myViewerRefreshRunnable = new Runnable() {

+			public void run() {

+				if (myViewer != null) {

+					myViewer.refresh();

+				}

+			}

+		};

+		myWorkspaceSynchronizer = new WorkspaceSynchronizer(editingDomain,

+				new WorkspaceSynchronizer.Delegate() {

+					public void dispose() {

+					}

+

+					public boolean handleResourceChanged(final Resource resource) {

+						unloadAllResources();

+						asyncRefresh();

+						return true;

+					}

+

+					public boolean handleResourceDeleted(Resource resource) {

+						unloadAllResources();

+						asyncRefresh();

+						return true;

+					}

+

+					public boolean handleResourceMoved(Resource resource,

+							final URI newURI) {

+						unloadAllResources();

+						asyncRefresh();

+						return true;

+					}

+				});

+	}

+

+	/**

+	 * @generated

+	 */

+	public void dispose() {

+		myWorkspaceSynchronizer.dispose();

+		myWorkspaceSynchronizer = null;

+		myViewerRefreshRunnable = null;

+		myViewer = null;

+		unloadAllResources();

+		((TransactionalEditingDomain) myEditingDomain).dispose();

+		myEditingDomain = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+		myViewer = viewer;

+	}

+

+	/**

+	 * @generated

+	 */

+	void unloadAllResources() {

+		for (Resource nextResource : myEditingDomain.getResourceSet()

+				.getResources()) {

+			nextResource.unload();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	void asyncRefresh() {

+		if (myViewer != null && !myViewer.getControl().isDisposed()) {

+			myViewer.getControl().getDisplay()

+					.asyncExec(myViewerRefreshRunnable);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object[] getElements(Object inputElement) {

+		return getChildren(inputElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void restoreState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void saveState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init(ICommonContentExtensionSite aConfig) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object[] getChildren(Object parentElement) {

+		if (parentElement instanceof IFile) {

+			IFile file = (IFile) parentElement;

+			URI fileURI = URI.createPlatformResourceURI(file.getFullPath()

+					.toString(), true);

+			Resource resource = myEditingDomain.getResourceSet().getResource(

+					fileURI, true);

+			ArrayList<ComrelNavigatorItem> result = new ArrayList<ComrelNavigatorItem>();

+			ArrayList<View> topViews = new ArrayList<View>(resource

+					.getContents().size());

+			for (EObject o : resource.getContents()) {

+				if (o instanceof View) {

+					topViews.add((View) o);

+				}

+			}

+			result.addAll(createNavigatorItems(

+					selectViewsByType(topViews,

+							CompositeRefactoringEditPart.MODEL_ID), file, false));

+			return result.toArray();

+		}

+

+		if (parentElement instanceof ComrelNavigatorGroup) {

+			ComrelNavigatorGroup group = (ComrelNavigatorGroup) parentElement;

+			return group.getChildren();

+		}

+

+		if (parentElement instanceof ComrelNavigatorItem) {

+			ComrelNavigatorItem navigatorItem = (ComrelNavigatorItem) parentElement;

+			if (navigatorItem.isLeaf() || !isOwnView(navigatorItem.getView())) {

+				return EMPTY_ARRAY;

+			}

+			return getViewChildren(navigatorItem.getView(), parentElement);

+		}

+

+		/*

+		 * Due to plugin.xml restrictions this code will be called only for views representing

+		 * shortcuts to this diagram elements created on other diagrams. 

+		 */

+		if (parentElement instanceof IAdaptable) {

+			View view = (View) ((IAdaptable) parentElement)

+					.getAdapter(View.class);

+			if (view != null) {

+				return getViewChildren(view, parentElement);

+			}

+		}

+

+		return EMPTY_ARRAY;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Object[] getViewChildren(View view, Object parentElement) {

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+

+		case CompositeRefactoringEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			result.addAll(getForeignShortcuts((Diagram) view, parentElement));

+			Diagram sv = (Diagram) view;

+			ComrelNavigatorGroup links = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_CompositeRefactoring_1000_links,

+					"icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(AtomicUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getDiagramLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			links.addChildren(createNavigatorItems(connectedViews, links, false));

+			connectedViews = getDiagramLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			links.addChildren(createNavigatorItems(connectedViews, links, false));

+			connectedViews = getDiagramLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			links.addChildren(createNavigatorItems(connectedViews, links, false));

+			if (!links.isEmpty()) {

+				result.add(links);

+			}

+			return result.toArray();

+		}

+

+		case SingleInputPort4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3009_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3009_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case CartesianQueuedUnit6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case CartesianQueuedUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case CartesianQueuedUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case AtomicUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ParallelQueuedUnit7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleQueuedUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiFilterUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SinglePortMappingEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Edge sv = (Edge) view;

+			ComrelNavigatorGroup target = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SinglePortMapping_4001_target,

+					"icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup source = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SinglePortMapping_4001_source,

+					"icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPortEditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPortEditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPortEditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPort2EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			if (!target.isEmpty()) {

+				result.add(target);

+			}

+			if (!source.isEmpty()) {

+				result.add(source);

+			}

+			return result.toArray();

+		}

+

+		case SequentialUnit7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ConditionalUnit6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionCheckEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case AtomicUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiFeatureUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ConditionalUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionCheckEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFeatureUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case AtomicUnit6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiFeatureUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case CartesianQueuedUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ConditionalUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionCheckEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFeatureUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SequentialUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case AtomicUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiFeatureUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleInputPort8EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3031_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3031_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case SingleInputPort5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3013_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3013_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case MultiFilterUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case CartesianQueuedUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiInputPort4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3014_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3014_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case ParallelQueuedUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFeatureUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiInputPort9EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3032_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3032_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case MultiInputPort7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3024_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3024_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case ConditionalUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionCheckEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SequentialUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleInputPort2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3001_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3001_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case SingleInputPort9EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3035_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3035_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case MultiInputPort3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3010_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3010_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case ConditionalUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionCheckEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFilterUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleOutputPortEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleOutputPort_3011_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case MultiFilterUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFeatureUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiFilterUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFeatureUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleQueuedUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SequentialUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleQueuedUnit6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleQueuedUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFilterUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFilterUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SequentialUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ParallelQueuedUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiInputPort8EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3028_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3028_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case SingleQueuedUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiInputPort5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3017_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3017_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case SingleInputPort3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3005_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3005_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case SingleQueuedUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case CartesianQueuedUnit7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case AtomicUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ParallelQueuedUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiInputPortEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3002_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3002_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case SequentialUnit6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiFeatureUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFilterUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleInputPort6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3023_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3023_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case CartesianQueuedUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnitEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ParallelQueuedUnit6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleInputPort7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3027_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_3027_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case MultiInputPort2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3006_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3006_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case SingleInputPortEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_2001_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleInputPort_2001_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case MultiFilterUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SequentialUnit2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ConditionalUnit7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionCheckEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleFilterUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleOutputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiFeatureUnit3EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPortEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ParallelQueuedUnitEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiOutputPortEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiOutputPort_3015_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case AtomicUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case ParallelQueuedUnit4EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiPortMappingEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Edge sv = (Edge) view;

+			ComrelNavigatorGroup target = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiPortMapping_4002_target,

+					"icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup source = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiPortMapping_4002_source,

+					"icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPortEditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPort2EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			if (!target.isEmpty()) {

+				result.add(target);

+			}

+			if (!source.isEmpty()) {

+				result.add(source);

+			}

+			return result.toArray();

+		}

+

+		case MultiInputPort6EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup incominglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3020_incominglinks,

+					"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiInputPort_3020_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getIncomingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			incominglinks.addChildren(createNavigatorItems(connectedViews,

+					incominglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!incominglinks.isEmpty()) {

+				result.add(incominglinks);

+			}

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case MultiSinglePortMappingEditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Edge sv = (Edge) view;

+			ComrelNavigatorGroup target = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiSinglePortMapping_4003_target,

+					"icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			ComrelNavigatorGroup source = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiSinglePortMapping_4003_source,

+					"icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPortEditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort2EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort3EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort4EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort5EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort7EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksTargetByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			target.addChildren(createNavigatorItems(connectedViews, target,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPortEditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort2EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort3EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort4EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPortEditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort5EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort6EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiOutputPort2EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort8EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			connectedViews = getLinksSourceByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			source.addChildren(createNavigatorItems(connectedViews, source,

+					true));

+			if (!target.isEmpty()) {

+				result.add(target);

+			}

+			if (!source.isEmpty()) {

+				result.add(source);

+			}

+			return result.toArray();

+		}

+

+		case SingleQueuedUnit7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case SingleOutputPort2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_SingleOutputPort_3018_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case ConditionalUnit5EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort8EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit5EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(SequentialUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(ConditionCheckEditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit6EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			connectedViews = getChildrenByType(

+					Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID));

+			connectedViews = getChildrenByType(connectedViews,

+					ComrelVisualIDRegistry

+							.getType(AtomicUnit7EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+

+		case MultiOutputPort2EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			ComrelNavigatorGroup outgoinglinks = new ComrelNavigatorGroup(

+					Messages.NavigatorGroupName_MultiOutputPort_3021_outgoinglinks,

+					"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$

+			Collection<View> connectedViews;

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiPortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			connectedViews = getOutgoingLinksByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+			outgoinglinks.addChildren(createNavigatorItems(connectedViews,

+					outgoinglinks, true));

+			if (!outgoinglinks.isEmpty()) {

+				result.add(outgoinglinks);

+			}

+			return result.toArray();

+		}

+

+		case AtomicUnit7EditPart.VISUAL_ID: {

+			LinkedList<ComrelAbstractNavigatorItem> result = new LinkedList<ComrelAbstractNavigatorItem>();

+			Node sv = (Node) view;

+			Collection<View> connectedViews;

+			connectedViews = getChildrenByType(Collections.singleton(sv),

+					ComrelVisualIDRegistry

+							.getType(SingleInputPort9EditPart.VISUAL_ID));

+			result.addAll(createNavigatorItems(connectedViews, parentElement,

+					false));

+			return result.toArray();

+		}

+		}

+		return EMPTY_ARRAY;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<View> getLinksSourceByType(Collection<Edge> edges,

+			String type) {

+		LinkedList<View> result = new LinkedList<View>();

+		for (Edge nextEdge : edges) {

+			View nextEdgeSource = nextEdge.getSource();

+			if (type.equals(nextEdgeSource.getType())

+					&& isOwnView(nextEdgeSource)) {

+				result.add(nextEdgeSource);

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<View> getLinksTargetByType(Collection<Edge> edges,

+			String type) {

+		LinkedList<View> result = new LinkedList<View>();

+		for (Edge nextEdge : edges) {

+			View nextEdgeTarget = nextEdge.getTarget();

+			if (type.equals(nextEdgeTarget.getType())

+					&& isOwnView(nextEdgeTarget)) {

+				result.add(nextEdgeTarget);

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<View> getOutgoingLinksByType(

+			Collection<? extends View> nodes, String type) {

+		LinkedList<View> result = new LinkedList<View>();

+		for (View nextNode : nodes) {

+			result.addAll(selectViewsByType(nextNode.getSourceEdges(), type));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<View> getIncomingLinksByType(

+			Collection<? extends View> nodes, String type) {

+		LinkedList<View> result = new LinkedList<View>();

+		for (View nextNode : nodes) {

+			result.addAll(selectViewsByType(nextNode.getTargetEdges(), type));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<View> getChildrenByType(

+			Collection<? extends View> nodes, String type) {

+		LinkedList<View> result = new LinkedList<View>();

+		for (View nextNode : nodes) {

+			result.addAll(selectViewsByType(nextNode.getChildren(), type));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<View> getDiagramLinksByType(

+			Collection<Diagram> diagrams, String type) {

+		ArrayList<View> result = new ArrayList<View>();

+		for (Diagram nextDiagram : diagrams) {

+			result.addAll(selectViewsByType(nextDiagram.getEdges(), type));

+		}

+		return result;

+	}

+

+	// TODO refactor as static method

+	/**

+	 * @generated

+	 */

+	private Collection<View> selectViewsByType(Collection<View> views,

+			String type) {

+		ArrayList<View> result = new ArrayList<View>();

+		for (View nextView : views) {

+			if (type.equals(nextView.getType()) && isOwnView(nextView)) {

+				result.add(nextView);

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isOwnView(View view) {

+		return CompositeRefactoringEditPart.MODEL_ID

+				.equals(ComrelVisualIDRegistry.getModelID(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<ComrelNavigatorItem> createNavigatorItems(

+			Collection<View> views, Object parent, boolean isLeafs) {

+		ArrayList<ComrelNavigatorItem> result = new ArrayList<ComrelNavigatorItem>(

+				views.size());

+		for (View nextView : views) {

+			result.add(new ComrelNavigatorItem(nextView, parent, isLeafs));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Collection<ComrelNavigatorItem> getForeignShortcuts(

+			Diagram diagram, Object parent) {

+		LinkedList<View> result = new LinkedList<View>();

+		for (Iterator<View> it = diagram.getChildren().iterator(); it.hasNext();) {

+			View nextView = it.next();

+			if (!isOwnView(nextView)

+					&& nextView.getEAnnotation("Shortcut") != null) { //$NON-NLS-1$

+				result.add(nextView);

+			}

+		}

+		return createNavigatorItems(result, parent, false);

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object getParent(Object element) {

+		if (element instanceof ComrelAbstractNavigatorItem) {

+			ComrelAbstractNavigatorItem abstractNavigatorItem = (ComrelAbstractNavigatorItem) element;

+			return abstractNavigatorItem.getParent();

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean hasChildren(Object element) {

+		return element instanceof IFile || getChildren(element).length > 0;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorGroup.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorGroup.java
new file mode 100644
index 0000000..488b217
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorGroup.java
@@ -0,0 +1,100 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import java.util.Collection;

+import java.util.LinkedList;

+

+/**

+ * @generated

+ */

+public class ComrelNavigatorGroup extends ComrelAbstractNavigatorItem {

+

+	/**

+	 * @generated

+	 */

+	private String myGroupName;

+

+	/**

+	 * @generated

+	 */

+	private String myIcon;

+

+	/**

+	 * @generated

+	 */

+	private Collection myChildren = new LinkedList();

+

+	/**

+	 * @generated

+	 */

+	ComrelNavigatorGroup(String groupName, String icon, Object parent) {

+		super(parent);

+		myGroupName = groupName;

+		myIcon = icon;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getGroupName() {

+		return myGroupName;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getIcon() {

+		return myIcon;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object[] getChildren() {

+		return myChildren.toArray();

+	}

+

+	/**

+	 * @generated

+	 */

+	public void addChildren(Collection children) {

+		myChildren.addAll(children);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void addChild(Object child) {

+		myChildren.add(child);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isEmpty() {

+		return myChildren.size() == 0;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean equals(Object obj) {

+		if (obj instanceof comrel.diagram.navigator.ComrelNavigatorGroup) {

+			comrel.diagram.navigator.ComrelNavigatorGroup anotherGroup = (comrel.diagram.navigator.ComrelNavigatorGroup) obj;

+			if (getGroupName().equals(anotherGroup.getGroupName())) {

+				return getParent().equals(anotherGroup.getParent());

+			}

+		}

+		return super.equals(obj);

+	}

+

+	/**

+	 * @generated

+	 */

+	public int hashCode() {

+		return getGroupName().hashCode();

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorItem.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorItem.java
new file mode 100644
index 0000000..02c74ff
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorItem.java
@@ -0,0 +1,93 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.core.runtime.IAdapterFactory;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.gmf.runtime.notation.View;

+

+/**

+ * @generated

+ */

+public class ComrelNavigatorItem extends ComrelAbstractNavigatorItem {

+

+	/**

+	 * @generated

+	 */

+	static {

+		final Class[] supportedTypes = new Class[] { View.class, EObject.class };

+		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

+

+			public Object getAdapter(Object adaptableObject, Class adapterType) {

+				if (adaptableObject instanceof comrel.diagram.navigator.ComrelNavigatorItem

+						&& (adapterType == View.class || adapterType == EObject.class)) {

+					return ((comrel.diagram.navigator.ComrelNavigatorItem) adaptableObject)

+							.getView();

+				}

+				return null;

+			}

+

+			public Class[] getAdapterList() {

+				return supportedTypes;

+			}

+		}, comrel.diagram.navigator.ComrelNavigatorItem.class);

+	}

+

+	/**

+	 * @generated

+	 */

+	private View myView;

+

+	/**

+	 * @generated

+	 */

+	private boolean myLeaf = false;

+

+	/**

+	 * @generated

+	 */

+	public ComrelNavigatorItem(View view, Object parent, boolean isLeaf) {

+		super(parent);

+		myView = view;

+		myLeaf = isLeaf;

+	}

+

+	/**

+	 * @generated

+	 */

+	public View getView() {

+		return myView;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isLeaf() {

+		return myLeaf;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean equals(Object obj) {

+		if (obj instanceof comrel.diagram.navigator.ComrelNavigatorItem) {

+			return EcoreUtil

+					.getURI(getView())

+					.equals(EcoreUtil

+							.getURI(((comrel.diagram.navigator.ComrelNavigatorItem) obj)

+									.getView()));

+		}

+		return super.equals(obj);

+	}

+

+	/**

+	 * @generated

+	 */

+	public int hashCode() {

+		return EcoreUtil.getURI(getView()).hashCode();

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorLabelProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorLabelProvider.java
new file mode 100644
index 0000000..b9add99
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorLabelProvider.java
@@ -0,0 +1,2417 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.jface.resource.ImageRegistry;

+import org.eclipse.jface.viewers.ITreePathLabelProvider;

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.jface.viewers.TreePath;

+import org.eclipse.jface.viewers.ViewerLabel;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.IMemento;

+import org.eclipse.ui.navigator.ICommonContentExtensionSite;

+import org.eclipse.ui.navigator.ICommonLabelProvider;

+

+import comrel.CompositeRefactoring;

+import comrel.diagram.edit.parts.*;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.diagram.providers.ComrelParserProvider;

+

+/**

+ * @generated

+ */

+public class ComrelNavigatorLabelProvider extends LabelProvider implements

+		ICommonLabelProvider, ITreePathLabelProvider {

+

+	/**

+	 * @generated

+	 */

+	static {

+		ComrelDiagramEditorPlugin

+				.getInstance()

+				.getImageRegistry()

+				.put("Navigator?UnknownElement", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$

+		ComrelDiagramEditorPlugin

+				.getInstance()

+				.getImageRegistry()

+				.put("Navigator?ImageNotFound", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public void updateLabel(ViewerLabel label, TreePath elementPath) {

+		Object element = elementPath.getLastSegment();

+		if (element instanceof ComrelNavigatorItem

+				&& !isOwnView(((ComrelNavigatorItem) element).getView())) {

+			return;

+		}

+		label.setText(getText(element));

+		label.setImage(getImage(element));

+	}

+

+	/**

+	 * @generated

+	 */

+	public Image getImage(Object element) {

+		if (element instanceof ComrelNavigatorGroup) {

+			ComrelNavigatorGroup group = (ComrelNavigatorGroup) element;

+			return ComrelDiagramEditorPlugin.getInstance().getBundledImage(

+					group.getIcon());

+		}

+

+		if (element instanceof ComrelNavigatorItem) {

+			ComrelNavigatorItem navigatorItem = (ComrelNavigatorItem) element;

+			if (!isOwnView(navigatorItem.getView())) {

+				return super.getImage(element);

+			}

+			return getImage(navigatorItem.getView());

+		}

+

+		// Due to plugin.xml content will be called only for "own" views

+		if (element instanceof IAdaptable) {

+			View view = (View) ((IAdaptable) element).getAdapter(View.class);

+			if (view != null && isOwnView(view)) {

+				return getImage(view);

+			}

+		}

+

+		return super.getImage(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public Image getImage(View view) {

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+		case CompositeRefactoringEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Diagram?http://comrel/0.1?CompositeRefactoring", ComrelElementTypes.CompositeRefactoring_1000); //$NON-NLS-1$

+		case ConditionCheckEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ConditionCheck", ComrelElementTypes.ConditionCheck_3076); //$NON-NLS-1$

+		case SingleInputPort4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3009); //$NON-NLS-1$

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?CartesianQueuedUnit", ComrelElementTypes.CartesianQueuedUnit_3033); //$NON-NLS-1$

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?TopLevelNode?http://comrel/0.1?CartesianQueuedUnit", ComrelElementTypes.CartesianQueuedUnit_2002); //$NON-NLS-1$

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?CartesianQueuedUnit", ComrelElementTypes.CartesianQueuedUnit_3025); //$NON-NLS-1$

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?AtomicUnit", ComrelElementTypes.AtomicUnit_3068); //$NON-NLS-1$

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ParallelQueuedUnit", ComrelElementTypes.ParallelQueuedUnit_3048); //$NON-NLS-1$

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleQueuedUnit", ComrelElementTypes.SingleQueuedUnit_3059); //$NON-NLS-1$

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFilterUnit", ComrelElementTypes.MultiFilterUnit_3053); //$NON-NLS-1$

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Link?http://comrel/0.1?SinglePortMapping", ComrelElementTypes.SinglePortMapping_4001); //$NON-NLS-1$

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SequentialUnit", ComrelElementTypes.SequentialUnit_3073); //$NON-NLS-1$

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ConditionalUnit", ComrelElementTypes.ConditionalUnit_3072); //$NON-NLS-1$

+		case AtomicUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?TopLevelNode?http://comrel/0.1?AtomicUnit", ComrelElementTypes.AtomicUnit_2007); //$NON-NLS-1$

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFeatureUnit", ComrelElementTypes.MultiFeatureUnit_3062); //$NON-NLS-1$

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ConditionalUnit", ComrelElementTypes.ConditionalUnit_3046); //$NON-NLS-1$

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFeatureUnit", ComrelElementTypes.SingleFeatureUnit_3008); //$NON-NLS-1$

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?AtomicUnit", ComrelElementTypes.AtomicUnit_3077); //$NON-NLS-1$

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFeatureUnit", ComrelElementTypes.MultiFeatureUnit_3039); //$NON-NLS-1$

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?CartesianQueuedUnit", ComrelElementTypes.CartesianQueuedUnit_3029); //$NON-NLS-1$

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ConditionalUnit", ComrelElementTypes.ConditionalUnit_3030); //$NON-NLS-1$

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFeatureUnit", ComrelElementTypes.SingleFeatureUnit_3055); //$NON-NLS-1$

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SequentialUnit", ComrelElementTypes.SequentialUnit_3069); //$NON-NLS-1$

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?AtomicUnit", ComrelElementTypes.AtomicUnit_3034); //$NON-NLS-1$

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFeatureUnit", ComrelElementTypes.MultiFeatureUnit_3012); //$NON-NLS-1$

+		case SingleInputPort8EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3031); //$NON-NLS-1$

+		case SingleInputPort5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3013); //$NON-NLS-1$

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFilterUnit", ComrelElementTypes.MultiFilterUnit_3019); //$NON-NLS-1$

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?CartesianQueuedUnit", ComrelElementTypes.CartesianQueuedUnit_3007); //$NON-NLS-1$

+		case MultiInputPort4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3014); //$NON-NLS-1$

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ParallelQueuedUnit", ComrelElementTypes.ParallelQueuedUnit_3036); //$NON-NLS-1$

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFeatureUnit", ComrelElementTypes.SingleFeatureUnit_3038); //$NON-NLS-1$

+		case MultiInputPort9EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3032); //$NON-NLS-1$

+		case MultiInputPort7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3024); //$NON-NLS-1$

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ConditionalUnit", ComrelElementTypes.ConditionalUnit_3066); //$NON-NLS-1$

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SequentialUnit", ComrelElementTypes.SequentialUnit_3060); //$NON-NLS-1$

+		case SingleInputPort2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3001); //$NON-NLS-1$

+		case SingleInputPort9EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3035); //$NON-NLS-1$

+		case MultiInputPort3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3010); //$NON-NLS-1$

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?TopLevelNode?http://comrel/0.1?ConditionalUnit", ComrelElementTypes.ConditionalUnit_2006); //$NON-NLS-1$

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFilterUnit", ComrelElementTypes.SingleFilterUnit_3016); //$NON-NLS-1$

+		case SingleOutputPortEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleOutputPort", ComrelElementTypes.SingleOutputPort_3011); //$NON-NLS-1$

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFilterUnit", ComrelElementTypes.MultiFilterUnit_3058); //$NON-NLS-1$

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFeatureUnit", ComrelElementTypes.SingleFeatureUnit_3061); //$NON-NLS-1$

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFilterUnit", ComrelElementTypes.MultiFilterUnit_3064); //$NON-NLS-1$

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFeatureUnit", ComrelElementTypes.SingleFeatureUnit_3050); //$NON-NLS-1$

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleQueuedUnit", ComrelElementTypes.SingleQueuedUnit_3054); //$NON-NLS-1$

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SequentialUnit", ComrelElementTypes.SequentialUnit_3044); //$NON-NLS-1$

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleQueuedUnit", ComrelElementTypes.SingleQueuedUnit_3065); //$NON-NLS-1$

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleQueuedUnit", ComrelElementTypes.SingleQueuedUnit_3042); //$NON-NLS-1$

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFilterUnit", ComrelElementTypes.SingleFilterUnit_3063); //$NON-NLS-1$

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFilterUnit", ComrelElementTypes.SingleFilterUnit_3057); //$NON-NLS-1$

+		case SequentialUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?TopLevelNode?http://comrel/0.1?SequentialUnit", ComrelElementTypes.SequentialUnit_2005); //$NON-NLS-1$

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ParallelQueuedUnit", ComrelElementTypes.ParallelQueuedUnit_3004); //$NON-NLS-1$

+		case MultiInputPort8EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3028); //$NON-NLS-1$

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?TopLevelNode?http://comrel/0.1?SingleQueuedUnit", ComrelElementTypes.SingleQueuedUnit_2004); //$NON-NLS-1$

+		case MultiInputPort5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3017); //$NON-NLS-1$

+		case SingleInputPort3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3005); //$NON-NLS-1$

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleQueuedUnit", ComrelElementTypes.SingleQueuedUnit_3022); //$NON-NLS-1$

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?CartesianQueuedUnit", ComrelElementTypes.CartesianQueuedUnit_3047); //$NON-NLS-1$

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?AtomicUnit", ComrelElementTypes.AtomicUnit_3049); //$NON-NLS-1$

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ParallelQueuedUnit", ComrelElementTypes.ParallelQueuedUnit_3043); //$NON-NLS-1$

+		case MultiInputPortEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3002); //$NON-NLS-1$

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SequentialUnit", ComrelElementTypes.SequentialUnit_3070); //$NON-NLS-1$

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFeatureUnit", ComrelElementTypes.MultiFeatureUnit_3056); //$NON-NLS-1$

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFilterUnit", ComrelElementTypes.SingleFilterUnit_3040); //$NON-NLS-1$

+		case SingleInputPort6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3023); //$NON-NLS-1$

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?CartesianQueuedUnit", ComrelElementTypes.CartesianQueuedUnit_3003); //$NON-NLS-1$

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ParallelQueuedUnit", ComrelElementTypes.ParallelQueuedUnit_3045); //$NON-NLS-1$

+		case SingleInputPort7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_3027); //$NON-NLS-1$

+		case MultiInputPort2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3006); //$NON-NLS-1$

+		case SingleInputPortEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?TopLevelNode?http://comrel/0.1?SingleInputPort", ComrelElementTypes.SingleInputPort_2001); //$NON-NLS-1$

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFilterUnit", ComrelElementTypes.MultiFilterUnit_3041); //$NON-NLS-1$

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SequentialUnit", ComrelElementTypes.SequentialUnit_3026); //$NON-NLS-1$

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ConditionalUnit", ComrelElementTypes.ConditionalUnit_3075); //$NON-NLS-1$

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleFilterUnit", ComrelElementTypes.SingleFilterUnit_3052); //$NON-NLS-1$

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiFeatureUnit", ComrelElementTypes.MultiFeatureUnit_3051); //$NON-NLS-1$

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?TopLevelNode?http://comrel/0.1?ParallelQueuedUnit", ComrelElementTypes.ParallelQueuedUnit_2003); //$NON-NLS-1$

+		case MultiOutputPortEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiOutputPort", ComrelElementTypes.MultiOutputPort_3015); //$NON-NLS-1$

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?AtomicUnit", ComrelElementTypes.AtomicUnit_3074); //$NON-NLS-1$

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ParallelQueuedUnit", ComrelElementTypes.ParallelQueuedUnit_3037); //$NON-NLS-1$

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Link?http://comrel/0.1?MultiPortMapping", ComrelElementTypes.MultiPortMapping_4002); //$NON-NLS-1$

+		case MultiInputPort6EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiInputPort", ComrelElementTypes.MultiInputPort_3020); //$NON-NLS-1$

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Link?http://comrel/0.1?MultiSinglePortMapping", ComrelElementTypes.MultiSinglePortMapping_4003); //$NON-NLS-1$

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleQueuedUnit", ComrelElementTypes.SingleQueuedUnit_3067); //$NON-NLS-1$

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?SingleOutputPort", ComrelElementTypes.SingleOutputPort_3018); //$NON-NLS-1$

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?ConditionalUnit", ComrelElementTypes.ConditionalUnit_3071); //$NON-NLS-1$

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?MultiOutputPort", ComrelElementTypes.MultiOutputPort_3021); //$NON-NLS-1$

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return getImage(

+					"Navigator?Node?http://comrel/0.1?AtomicUnit", ComrelElementTypes.AtomicUnit_3078); //$NON-NLS-1$

+		}

+		return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	private Image getImage(String key, IElementType elementType) {

+		ImageRegistry imageRegistry = ComrelDiagramEditorPlugin.getInstance()

+				.getImageRegistry();

+		Image image = imageRegistry.get(key);

+		if (image == null && elementType != null

+				&& ComrelElementTypes.isKnownElementType(elementType)) {

+			image = ComrelElementTypes.getImage(elementType);

+			imageRegistry.put(key, image);

+		}

+

+		if (image == null) {

+			image = imageRegistry.get("Navigator?ImageNotFound"); //$NON-NLS-1$

+			imageRegistry.put(key, image);

+		}

+		return image;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getText(Object element) {

+		if (element instanceof ComrelNavigatorGroup) {

+			ComrelNavigatorGroup group = (ComrelNavigatorGroup) element;

+			return group.getGroupName();

+		}

+

+		if (element instanceof ComrelNavigatorItem) {

+			ComrelNavigatorItem navigatorItem = (ComrelNavigatorItem) element;

+			if (!isOwnView(navigatorItem.getView())) {

+				return null;

+			}

+			return getText(navigatorItem.getView());

+		}

+

+		// Due to plugin.xml content will be called only for "own" views

+		if (element instanceof IAdaptable) {

+			View view = (View) ((IAdaptable) element).getAdapter(View.class);

+			if (view != null && isOwnView(view)) {

+				return getText(view);

+			}

+		}

+

+		return super.getText(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getText(View view) {

+		if (view.getElement() != null && view.getElement().eIsProxy()) {

+			return getUnresolvedDomainElementProxyText(view);

+		}

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+		case CompositeRefactoringEditPart.VISUAL_ID:

+			return getCompositeRefactoring_1000Text(view);

+		case ConditionCheckEditPart.VISUAL_ID:

+			return getConditionCheck_3076Text(view);

+		case SingleInputPort4EditPart.VISUAL_ID:

+			return getSingleInputPort_3009Text(view);

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3033Text(view);

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_2002Text(view);

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3025Text(view);

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return getAtomicUnit_3068Text(view);

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3048Text(view);

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3059Text(view);

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3053Text(view);

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getSinglePortMapping_4001Text(view);

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return getSequentialUnit_3073Text(view);

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return getConditionalUnit_3072Text(view);

+		case AtomicUnitEditPart.VISUAL_ID:

+			return getAtomicUnit_2007Text(view);

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3062Text(view);

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return getConditionalUnit_3046Text(view);

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3008Text(view);

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return getAtomicUnit_3077Text(view);

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3039Text(view);

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3029Text(view);

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return getConditionalUnit_3030Text(view);

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3055Text(view);

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return getSequentialUnit_3069Text(view);

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return getAtomicUnit_3034Text(view);

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3012Text(view);

+		case SingleInputPort8EditPart.VISUAL_ID:

+			return getSingleInputPort_3031Text(view);

+		case SingleInputPort5EditPart.VISUAL_ID:

+			return getSingleInputPort_3013Text(view);

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return getMultiFilterUnit_3019Text(view);

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3007Text(view);

+		case MultiInputPort4EditPart.VISUAL_ID:

+			return getMultiInputPort_3014Text(view);

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3036Text(view);

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3038Text(view);

+		case MultiInputPort9EditPart.VISUAL_ID:

+			return getMultiInputPort_3032Text(view);

+		case MultiInputPort7EditPart.VISUAL_ID:

+			return getMultiInputPort_3024Text(view);

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return getConditionalUnit_3066Text(view);

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return getSequentialUnit_3060Text(view);

+		case SingleInputPort2EditPart.VISUAL_ID:

+			return getSingleInputPort_3001Text(view);

+		case SingleInputPort9EditPart.VISUAL_ID:

+			return getSingleInputPort_3035Text(view);

+		case MultiInputPort3EditPart.VISUAL_ID:

+			return getMultiInputPort_3010Text(view);

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return getConditionalUnit_2006Text(view);

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return getSingleFilterUnit_3016Text(view);

+		case SingleOutputPortEditPart.VISUAL_ID:

+			return getSingleOutputPort_3011Text(view);

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3058Text(view);

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3061Text(view);

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3064Text(view);

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3050Text(view);

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3054Text(view);

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return getSequentialUnit_3044Text(view);

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3065Text(view);

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3042Text(view);

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3063Text(view);

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3057Text(view);

+		case SequentialUnitEditPart.VISUAL_ID:

+			return getSequentialUnit_2005Text(view);

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3004Text(view);

+		case MultiInputPort8EditPart.VISUAL_ID:

+			return getMultiInputPort_3028Text(view);

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return getSingleQueuedUnit_2004Text(view);

+		case MultiInputPort5EditPart.VISUAL_ID:

+			return getMultiInputPort_3017Text(view);

+		case SingleInputPort3EditPart.VISUAL_ID:

+			return getSingleInputPort_3005Text(view);

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3022Text(view);

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3047Text(view);

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return getAtomicUnit_3049Text(view);

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3043Text(view);

+		case MultiInputPortEditPart.VISUAL_ID:

+			return getMultiInputPort_3002Text(view);

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return getSequentialUnit_3070Text(view);

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3056Text(view);

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3040Text(view);

+		case SingleInputPort6EditPart.VISUAL_ID:

+			return getSingleInputPort_3023Text(view);

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3003Text(view);

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3045Text(view);

+		case SingleInputPort7EditPart.VISUAL_ID:

+			return getSingleInputPort_3027Text(view);

+		case MultiInputPort2EditPart.VISUAL_ID:

+			return getMultiInputPort_3006Text(view);

+		case SingleInputPortEditPart.VISUAL_ID:

+			return getSingleInputPort_2001Text(view);

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3041Text(view);

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return getSequentialUnit_3026Text(view);

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return getConditionalUnit_3075Text(view);

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3052Text(view);

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3051Text(view);

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return getParallelQueuedUnit_2003Text(view);

+		case MultiOutputPortEditPart.VISUAL_ID:

+			return getMultiOutputPort_3015Text(view);

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return getAtomicUnit_3074Text(view);

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3037Text(view);

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getMultiPortMapping_4002Text(view);

+		case MultiInputPort6EditPart.VISUAL_ID:

+			return getMultiInputPort_3020Text(view);

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getMultiSinglePortMapping_4003Text(view);

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3067Text(view);

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			return getSingleOutputPort_3018Text(view);

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return getConditionalUnit_3071Text(view);

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			return getMultiOutputPort_3021Text(view);

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return getAtomicUnit_3078Text(view);

+		}

+		return getUnknownElementText(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3017Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3017,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5014); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionalUnit_3075Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionalUnit_3075,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5055); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleQueuedUnit_3059Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SingleQueuedUnit_3059,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SingleQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5063); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSequentialUnit_3060Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SequentialUnit_3060,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SequentialUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5062); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getAtomicUnit_3074Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.AtomicUnit_3074,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5050); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionCheck_3076Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionCheck_3076,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionCheckNameTypeSpecEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5052); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFilterUnit_3052Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFilterUnit_3052,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5038); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionalUnit_3066Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionalUnit_3066,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5060); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3035Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3035,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType9EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5026); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFilterUnit_3016Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFilterUnit_3016,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5016); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFilterUnit_3058Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFilterUnit_3058,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5043); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3032Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3032,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType9EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5025); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleQueuedUnit_3067Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SingleQueuedUnit_3067,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SingleQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5049); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSequentialUnit_3073Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SequentialUnit_3073,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SequentialUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5051); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getAtomicUnit_3034Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.AtomicUnit_3034,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5027); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFeatureUnit_3056Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFeatureUnit_3056,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5041); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFilterUnit_3041Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFilterUnit_3041,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5032); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionalUnit_3046Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionalUnit_3046,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5065); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getParallelQueuedUnit_3037Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.ParallelQueuedUnit_3037,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(ParallelQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5070); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3013Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3013,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5010); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleQueuedUnit_3022Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SingleQueuedUnit_3022,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SingleQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5076); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3024Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3024,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5021); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiPortMapping_4002Text(View view) {

+		return ""; //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFilterUnit_3053Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFilterUnit_3053,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5039); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getAtomicUnit_3077Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.AtomicUnit_3077,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5053); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getAtomicUnit_3068Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.AtomicUnit_3068,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5048); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3020Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3020,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5017); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFilterUnit_3064Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFilterUnit_3064,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5047); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleOutputPort_3018Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleOutputPort_3018,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleOutputPortNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5015); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSinglePortMapping_4001Text(View view) {

+		return ""; //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3010Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3010,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5007); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSequentialUnit_2005Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SequentialUnit_2005,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SequentialUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5083); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSequentialUnit_3026Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SequentialUnit_3026,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SequentialUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5074); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFeatureUnit_3055Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFeatureUnit_3055,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5040); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFeatureUnit_3050Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFeatureUnit_3050,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5036); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionalUnit_3030Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionalUnit_3030,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5072); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getParallelQueuedUnit_3045Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.ParallelQueuedUnit_3045,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(ParallelQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5066); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getParallelQueuedUnit_3043Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.ParallelQueuedUnit_3043,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(ParallelQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5068); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionalUnit_3071Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionalUnit_3071,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5057); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3023Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3023,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5020); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiOutputPort_3015Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiOutputPort_3015,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiOutputPortNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5012); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFeatureUnit_3062Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFeatureUnit_3062,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5045); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCartesianQueuedUnit_2002Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.CartesianQueuedUnit_2002,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(CartesianQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5080); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFeatureUnit_3039Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFeatureUnit_3039,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5030); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleOutputPort_3011Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleOutputPort_3011,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleOutputPortNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5008); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCartesianQueuedUnit_3025Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.CartesianQueuedUnit_3025,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(CartesianQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5075); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFeatureUnit_3038Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFeatureUnit_3038,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5029); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFilterUnit_3063Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFilterUnit_3063,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5046); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFilterUnit_3019Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFilterUnit_3019,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5019); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFeatureUnit_3008Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFeatureUnit_3008,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5009); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCartesianQueuedUnit_3029Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.CartesianQueuedUnit_3029,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(CartesianQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5073); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionalUnit_3072Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionalUnit_3072,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5056); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3005Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3005,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5004); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getAtomicUnit_3078Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.AtomicUnit_3078,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5054); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleQueuedUnit_3054Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SingleQueuedUnit_3054,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SingleQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5064); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3002Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3002,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5003); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleQueuedUnit_3042Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SingleQueuedUnit_3042,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SingleQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5069); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getParallelQueuedUnit_3036Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.ParallelQueuedUnit_3036,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(ParallelQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5071); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSequentialUnit_3044Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SequentialUnit_3044,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SequentialUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5067); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getConditionalUnit_2006Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.ConditionalUnit_2006,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5084); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3006Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3006,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5005); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3031Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3031,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType8EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5024); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiOutputPort_3021Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiOutputPort_3021,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiOutputPortNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5018); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSequentialUnit_3069Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SequentialUnit_3069,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SequentialUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5059); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCartesianQueuedUnit_3033Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.CartesianQueuedUnit_3033,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(CartesianQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5028); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_2001Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_2001,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5001); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3009Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3009,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5006); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getParallelQueuedUnit_3048Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.ParallelQueuedUnit_3048,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(ParallelQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5035); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCartesianQueuedUnit_3003Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.CartesianQueuedUnit_3003,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(CartesianQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5079); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleQueuedUnit_3065Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SingleQueuedUnit_3065,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SingleQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5061); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFeatureUnit_3061Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFeatureUnit_3061,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType5EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5044); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCartesianQueuedUnit_3007Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.CartesianQueuedUnit_3007,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(CartesianQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5077); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCartesianQueuedUnit_3047Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.CartesianQueuedUnit_3047,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(CartesianQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5033); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFilterUnit_3040Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFilterUnit_3040,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5031); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getParallelQueuedUnit_3004Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.ParallelQueuedUnit_3004,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(ParallelQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5078); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getCompositeRefactoring_1000Text(View view) {

+		CompositeRefactoring domainModelElement = (CompositeRefactoring) view

+				.getElement();

+		if (domainModelElement != null) {

+			return domainModelElement.getName();

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"No domain element for view with visualID = " + 1000); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFeatureUnit_3012Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFeatureUnit_3012,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5013); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3027Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3027,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType7EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5022); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleInputPort_3001Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleInputPort_3001,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType2EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5002); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSequentialUnit_3070Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SequentialUnit_3070,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SequentialUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5058); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getAtomicUnit_2007Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.AtomicUnit_2007,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelTypeEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5085); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleQueuedUnit_2004Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.SingleQueuedUnit_2004,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(SingleQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5082); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3028Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3028,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType8EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5023); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiSinglePortMapping_4003Text(View view) {

+		return ""; //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getAtomicUnit_3049Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.AtomicUnit_3049,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5034); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getParallelQueuedUnit_2003Text(View view) {

+		IParser parser = ComrelParserProvider

+				.getParser(

+						ComrelElementTypes.ParallelQueuedUnit_2003,

+						view.getElement() != null ? view.getElement() : view,

+						ComrelVisualIDRegistry

+								.getType(ParallelQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5081); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiFeatureUnit_3051Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiFeatureUnit_3051,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType3EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5037); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getMultiInputPort_3014Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.MultiInputPort_3014,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5011); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getSingleFilterUnit_3057Text(View view) {

+		IParser parser = ComrelParserProvider.getParser(

+				ComrelElementTypes.SingleFilterUnit_3057,

+				view.getElement() != null ? view.getElement() : view,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType4EditPart.VISUAL_ID));

+		if (parser != null) {

+			return parser.getPrintString(new EObjectAdapter(

+					view.getElement() != null ? view.getElement() : view),

+					ParserOptions.NONE.intValue());

+		} else {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Parser was not found for label " + 5042); //$NON-NLS-1$

+			return ""; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getUnknownElementText(View view) {

+		return "<UnknownElement Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$  //$NON-NLS-2$

+	}

+

+	/**

+	 * @generated

+	 */

+	private String getUnresolvedDomainElementProxyText(View view) {

+		return "<Unresolved domain element Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$  //$NON-NLS-2$

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init(ICommonContentExtensionSite aConfig) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void restoreState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void saveState(IMemento aMemento) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getDescription(Object anElement) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isOwnView(View view) {

+		return CompositeRefactoringEditPart.MODEL_ID

+				.equals(ComrelVisualIDRegistry.getModelID(view));

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorLinkHelper.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorLinkHelper.java
new file mode 100644
index 0000000..a142c10
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorLinkHelper.java
@@ -0,0 +1,132 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.common.ui.URIEditorInput;

+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.EcoreUtil;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.GraphicalViewer;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+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.IWorkbenchPage;

+import org.eclipse.ui.navigator.ILinkHelper;

+import org.eclipse.ui.part.FileEditorInput;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class ComrelNavigatorLinkHelper implements ILinkHelper {

+

+	/**

+	 * @generated

+	 */

+	private static IEditorInput getEditorInput(Diagram diagram) {

+		Resource diagramResource = diagram.eResource();

+		for (EObject nextEObject : diagramResource.getContents()) {

+			if (nextEObject == diagram) {

+				return new FileEditorInput(

+						WorkspaceSynchronizer.getFile(diagramResource));

+			}

+			if (nextEObject instanceof Diagram) {

+				break;

+			}

+		}

+		URI uri = EcoreUtil.getURI(diagram);

+		String editorName = uri.lastSegment() + '#'

+				+ diagram.eResource().getContents().indexOf(diagram);

+		IEditorInput editorInput = new URIEditorInput(uri, editorName);

+		return editorInput;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IStructuredSelection findSelection(IEditorInput anInput) {

+		IDiagramDocument document = ComrelDiagramEditorPlugin.getInstance()

+				.getDocumentProvider().getDiagramDocument(anInput);

+		if (document == null) {

+			return StructuredSelection.EMPTY;

+		}

+		Diagram diagram = document.getDiagram();

+		IFile file = WorkspaceSynchronizer.getFile(diagram.eResource());

+		if (file != null) {

+			ComrelNavigatorItem item = new ComrelNavigatorItem(diagram, file,

+					false);

+			return new StructuredSelection(item);

+		}

+		return StructuredSelection.EMPTY;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void activateEditor(IWorkbenchPage aPage,

+			IStructuredSelection aSelection) {

+		if (aSelection == null || aSelection.isEmpty()) {

+			return;

+		}

+		if (false == aSelection.getFirstElement() instanceof ComrelAbstractNavigatorItem) {

+			return;

+		}

+

+		ComrelAbstractNavigatorItem abstractNavigatorItem = (ComrelAbstractNavigatorItem) aSelection

+				.getFirstElement();

+		View navigatorView = null;

+		if (abstractNavigatorItem instanceof ComrelNavigatorItem) {

+			navigatorView = ((ComrelNavigatorItem) abstractNavigatorItem)

+					.getView();

+		} else if (abstractNavigatorItem instanceof ComrelNavigatorGroup) {

+			ComrelNavigatorGroup navigatorGroup = (ComrelNavigatorGroup) abstractNavigatorItem;

+			if (navigatorGroup.getParent() instanceof ComrelNavigatorItem) {

+				navigatorView = ((ComrelNavigatorItem) navigatorGroup

+						.getParent()).getView();

+			} else if (navigatorGroup.getParent() instanceof IAdaptable) {

+				navigatorView = (View) ((IAdaptable) navigatorGroup.getParent())

+						.getAdapter(View.class);

+			}

+		}

+		if (navigatorView == null) {

+			return;

+		}

+		IEditorInput editorInput = getEditorInput(navigatorView.getDiagram());

+		IEditorPart editor = aPage.findEditor(editorInput);

+		if (editor == null) {

+			return;

+		}

+		aPage.bringToTop(editor);

+		if (editor instanceof DiagramEditor) {

+			DiagramEditor diagramEditor = (DiagramEditor) editor;

+			ResourceSet diagramEditorResourceSet = diagramEditor

+					.getEditingDomain().getResourceSet();

+			EObject selectedView = diagramEditorResourceSet.getEObject(

+					EcoreUtil.getURI(navigatorView), true);

+			if (selectedView == null) {

+				return;

+			}

+			GraphicalViewer graphicalViewer = (GraphicalViewer) diagramEditor

+					.getAdapter(GraphicalViewer.class);

+			EditPart selectedEditPart = (EditPart) graphicalViewer

+					.getEditPartRegistry().get(selectedView);

+			if (selectedEditPart != null) {

+				graphicalViewer.select(selectedEditPart);

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorSorter.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorSorter.java
new file mode 100644
index 0000000..beecb3d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/navigator/ComrelNavigatorSorter.java
@@ -0,0 +1,39 @@
+/*

+ * 

+ */

+package comrel.diagram.navigator;

+

+import org.eclipse.jface.viewers.ViewerSorter;

+

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelNavigatorSorter extends ViewerSorter {

+

+	/**

+	 * @generated

+	 */

+	private static final int GROUP_CATEGORY = 7086;

+

+	/**

+	 * @generated

+	 */

+	private static final int SHORTCUTS_CATEGORY = 7085;

+

+	/**

+	 * @generated

+	 */

+	public int category(Object element) {

+		if (element instanceof ComrelNavigatorItem) {

+			ComrelNavigatorItem item = (ComrelNavigatorItem) element;

+			if (item.getView().getEAnnotation("Shortcut") != null) { //$NON-NLS-1$

+				return SHORTCUTS_CATEGORY;

+			}

+			return ComrelVisualIDRegistry.getVisualID(item.getView());

+		}

+		return GROUP_CATEGORY;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/parsers/AbstractParser.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/parsers/AbstractParser.java
new file mode 100644
index 0000000..4c4b653
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/parsers/AbstractParser.java
@@ -0,0 +1,468 @@
+/*

+ * 

+ */

+package comrel.diagram.parsers;

+

+import java.util.Arrays;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAttribute;

+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.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+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.commands.core.command.CompositeTransactionalCommand;

+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;

+import org.eclipse.osgi.util.NLS;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public abstract class AbstractParser implements IParser {

+

+	/**

+	 * @generated

+	 */

+	protected final EAttribute[] features;

+

+	/**

+	 * @generated

+	 */

+	protected final EAttribute[] editableFeatures;

+

+	/**

+	 * @generated

+	 */

+	private String viewPattern;

+

+	/**

+	 * @generated

+	 */

+	private String editorPattern;

+

+	/**

+	 * @generated

+	 */

+	private String editPattern;

+

+	/**

+	 * @generated

+	 */

+	public AbstractParser(EAttribute[] features) {

+		if (features == null || Arrays.asList(features).contains(null)) {

+			throw new IllegalArgumentException();

+		}

+		this.editableFeatures = this.features = features;

+	}

+

+	/**

+	 * @generated

+	 */

+	public AbstractParser(EAttribute[] features, EAttribute[] editableFeatures) {

+		if (features == null || Arrays.asList(features).contains(null)) {

+			throw new IllegalArgumentException();

+		}

+		this.features = features;

+		if (editableFeatures == null

+				|| Arrays.asList(editableFeatures).contains(null)) {

+			throw new IllegalArgumentException();

+		}

+		this.editableFeatures = editableFeatures;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getViewPattern() {

+		return viewPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setViewPattern(String viewPattern) {

+		this.viewPattern = viewPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditorPattern() {

+		return editorPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditorPattern(String editorPattern) {

+		this.editorPattern = editorPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditPattern() {

+		return editPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditPattern(String editPattern) {

+		this.editPattern = editPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isAffectingEvent(Object event, int flags) {

+		if (event instanceof Notification) {

+			return isAffectingFeature(((Notification) event).getFeature());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isAffectingFeature(Object feature) {

+		for (int i = 0; i < features.length; i++) {

+			if (features[i] == feature) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Object[] getValues(EObject element) {

+		Object[] values = new Object[features.length];

+		for (int i = 0; i < features.length; i++) {

+			values[i] = getValue(element, features[i]);

+		}

+		return values;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Object[] getEditableValues(EObject element) {

+		Object[] values = new Object[editableFeatures.length];

+		for (int i = 0; i < editableFeatures.length; i++) {

+			values[i] = getValue(element, editableFeatures[i]);

+		}

+		return values;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Object getValue(EObject element, EAttribute feature) {

+		Object value = element.eGet(feature);

+		Class iClass = feature.getEAttributeType().getInstanceClass();

+		if (String.class.equals(iClass)) {

+			if (value == null) {

+				value = ""; //$NON-NLS-1$

+			}

+		}

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ICommand getParseCommand(IAdaptable adapter, Object[] values,

+			int flags) {

+		if (values == null

+				|| validateNewValues(values).getCode() != IParserEditStatus.EDITABLE) {

+			return UnexecutableCommand.INSTANCE;

+		}

+		EObject element = (EObject) adapter.getAdapter(EObject.class);

+		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++) {

+			command.compose(getModificationCommand(element,

+					editableFeatures[i], values[i]));

+		}

+		return command;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ICommand getModificationCommand(EObject element,

+			EAttribute 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 IParserEditStatus validateNewValues(Object[] values) {

+		if (values.length != editableFeatures.length) {

+			return ParserEditStatus.UNEDITABLE_STATUS;

+		}

+		for (int i = 0; i < values.length; i++) {

+			Object value = getValidNewValue(editableFeatures[i], values[i]);

+			if (value instanceof InvalidValue) {

+				return new ParserEditStatus(ComrelDiagramEditorPlugin.ID,

+						IParserEditStatus.UNEDITABLE, value.toString());

+			}

+		}

+		return ParserEditStatus.EDITABLE_STATUS;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Object getValidNewValue(EAttribute 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(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} 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(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} 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(

+									NLS.bind(

+											Messages.AbstractParser_WrongStringConversion,

+											iClass.getName()));

+						}

+					}

+				} else {

+					value = new InvalidValue(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} 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(

+									NLS.bind(

+											Messages.AbstractParser_WrongStringConversion,

+											iClass.getName()));

+						}

+					}

+				} else {

+					value = new InvalidValue(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} 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(

+									NLS.bind(

+											Messages.AbstractParser_WrongStringConversion,

+											iClass.getName()));

+						}

+					}

+				} else {

+					value = new InvalidValue(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} 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(

+									NLS.bind(

+											Messages.AbstractParser_WrongStringConversion,

+											iClass.getName()));

+						}

+					}

+				} else {

+					value = new InvalidValue(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} 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(

+									NLS.bind(

+											Messages.AbstractParser_WrongStringConversion,

+											iClass.getName()));

+						}

+					}

+				} else {

+					value = new InvalidValue(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} 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(

+									NLS.bind(

+											Messages.AbstractParser_WrongStringConversion,

+											iClass.getName()));

+						}

+					}

+				} else {

+					value = new InvalidValue(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							iClass.getName()));

+				}

+			} else if (type instanceof EEnum) {

+				if (value instanceof String) {

+					EEnumLiteral literal = ((EEnum) type)

+							.getEEnumLiteralByLiteral((String) value);

+					if (literal == null) {

+						value = new InvalidValue(NLS.bind(

+								Messages.AbstractParser_UnknownLiteral, value));

+					} else {

+						value = literal.getInstance();

+					}

+				} else {

+					value = new InvalidValue(NLS.bind(

+							Messages.AbstractParser_UnexpectedValueType,

+							String.class.getName()));

+				}

+			}

+		}

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected class InvalidValue {

+

+		/**

+		 * @generated

+		 */

+		private String description;

+

+		/**

+		 * @generated

+		 */

+		public InvalidValue(String description) {

+			this.description = description;

+		}

+

+		/**

+		 * @generated

+		 */

+		public String toString() {

+			return description;

+		}

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/parsers/MessageFormatParser.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/parsers/MessageFormatParser.java
new file mode 100644
index 0000000..a45f7ed
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/parsers/MessageFormatParser.java
@@ -0,0 +1,208 @@
+/*

+ * 

+ */

+package comrel.diagram.parsers;

+

+import java.text.FieldPosition;

+import java.text.MessageFormat;

+import java.text.ParsePosition;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.osgi.util.NLS;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class MessageFormatParser extends AbstractParser {

+

+	/**

+	 * @generated

+	 */

+	private String defaultPattern;

+

+	/**

+	 * @generated

+	 */

+	private String defaultEditablePattern;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat viewProcessor;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat editorProcessor;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat editProcessor;

+

+	/**

+	 * @generated

+	 */

+	public MessageFormatParser(EAttribute[] features) {

+		super(features);

+	}

+

+	/**

+	 * @generated

+	 */

+	public MessageFormatParser(EAttribute[] features,

+			EAttribute[] editableFeatures) {

+		super(features, editableFeatures);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getDefaultPattern() {

+		if (defaultPattern == null) {

+			StringBuffer sb = new StringBuffer();

+			for (int i = 0; i < features.length; i++) {

+				if (i > 0) {

+					sb.append(' ');

+				}

+				sb.append('{');

+				sb.append(i);

+				sb.append('}');

+			}

+			defaultPattern = sb.toString();

+		}

+		return defaultPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setViewPattern(String viewPattern) {

+		super.setViewPattern(viewPattern);

+		viewProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditorPattern(String editorPattern) {

+		super.setEditorPattern(editorPattern);

+		editorProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getViewProcessor() {

+		if (viewProcessor == null) {

+			viewProcessor = new MessageFormat(

+					getViewPattern() == null ? getDefaultPattern()

+							: getViewPattern());

+		}

+		return viewProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getEditorProcessor() {

+		if (editorProcessor == null) {

+			editorProcessor = new MessageFormat(

+					getEditorPattern() == null ? getDefaultEditablePattern()

+							: getEditorPattern());

+		}

+		return editorProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getDefaultEditablePattern() {

+		if (defaultEditablePattern == null) {

+			StringBuffer sb = new StringBuffer();

+			for (int i = 0; i < editableFeatures.length; i++) {

+				if (i > 0) {

+					sb.append(' ');

+				}

+				sb.append('{');

+				sb.append(i);

+				sb.append('}');

+			}

+			defaultEditablePattern = sb.toString();

+		}

+		return defaultEditablePattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditPattern(String editPattern) {

+		super.setEditPattern(editPattern);

+		editProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getEditProcessor() {

+		if (editProcessor == null) {

+			editProcessor = new MessageFormat(

+					getEditPattern() == null ? getDefaultEditablePattern()

+							: getEditPattern());

+		}

+		return editProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditString(IAdaptable adapter, int flags) {

+		EObject element = (EObject) adapter.getAdapter(EObject.class);

+		return getEditorProcessor().format(getEditableValues(element),

+				new StringBuffer(), new FieldPosition(0)).toString();

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParserEditStatus isValidEditString(IAdaptable adapter,

+			String editString) {

+		ParsePosition pos = new ParsePosition(0);

+		Object[] values = getEditProcessor().parse(editString, pos);

+		if (values == null) {

+			return new ParserEditStatus(ComrelDiagramEditorPlugin.ID,

+					IParserEditStatus.UNEDITABLE, NLS.bind(

+							Messages.MessageFormatParser_InvalidInputError,

+							new Integer(pos.getErrorIndex())));

+		}

+		return validateNewValues(values);

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICommand getParseCommand(IAdaptable adapter, String newString,

+			int flags) {

+		Object[] values = getEditProcessor().parse(newString,

+				new ParsePosition(0));

+		return getParseCommand(adapter, values, flags);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getPrintString(IAdaptable adapter, int flags) {

+		EObject element = (EObject) adapter.getAdapter(EObject.class);

+		return getViewProcessor().format(getValues(element),

+				new StringBuffer(), new FieldPosition(0)).toString();

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCreationWizard.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCreationWizard.java
new file mode 100644
index 0000000..93db297
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCreationWizard.java
@@ -0,0 +1,185 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.lang.reflect.InvocationTargetException;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.jface.dialogs.ErrorDialog;

+import org.eclipse.jface.operation.IRunnableWithProgress;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.ui.INewWizard;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+/**

+ * @generated

+ */

+public class ComrelCreationWizard extends Wizard implements INewWizard {

+

+	private ComrelCustomCreationWizardPage customPage;

+

+	/**

+	 * @generated

+	 */

+	private IWorkbench workbench;

+

+	/**

+	 * @generated

+	 */

+	protected IStructuredSelection selection;

+

+	/**

+	 * @generated

+	 */

+	protected ComrelCreationWizardPage diagramModelFilePage;

+

+	/**

+	 * @generated

+	 */

+	protected ComrelCreationWizardPage domainModelFilePage;

+

+	/**

+	 * @generated

+	 */

+	protected Resource diagram;

+

+	/**

+	 * @generated

+	 */

+	private boolean openNewlyCreatedDiagramEditor = true;

+

+	/**

+	 * @generated

+	 */

+	public IWorkbench getWorkbench() {

+		return workbench;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IStructuredSelection getSelection() {

+		return selection;

+	}

+

+	/**

+	 * @generated

+	 */

+	public final Resource getDiagram() {

+		return diagram;

+	}

+

+	/**

+	 * @generated

+	 */

+	public final boolean isOpenNewlyCreatedDiagramEditor() {

+		return openNewlyCreatedDiagramEditor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setOpenNewlyCreatedDiagramEditor(

+			boolean openNewlyCreatedDiagramEditor) {

+		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		this.workbench = workbench;

+		this.selection = selection;

+		setWindowTitle(Messages.ComrelCreationWizardTitle);

+		setDefaultPageImageDescriptor(ComrelDiagramEditorPlugin

+				.getBundledImageDescriptor("icons/wizban/NewComrelWizard.gif")); //$NON-NLS-1$

+		setNeedsProgressMonitor(true);

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public void addPages() {

+

+		diagramModelFilePage = new ComrelCreationWizardPage(

+				"DiagramModelFile", getSelection(), "comrel_diagram"); //$NON-NLS-1$ //$NON-NLS-2$

+		diagramModelFilePage

+				.setTitle(Messages.ComrelCreationWizard_DiagramModelFilePageTitle);

+		diagramModelFilePage

+				.setDescription(Messages.ComrelCreationWizard_DiagramModelFilePageDescription);

+		addPage(diagramModelFilePage);

+

+		domainModelFilePage = new ComrelCreationWizardPage(

+				"DomainModelFile", getSelection(), "comrel") { //$NON-NLS-1$ //$NON-NLS-2$

+

+			public void setVisible(boolean visible) {

+				if (visible) {

+					String fileName = diagramModelFilePage.getFileName();

+					fileName = fileName.substring(0, fileName.length()

+							- ".comrel_diagram".length()); //$NON-NLS-1$

+					setFileName(ComrelDiagramEditorUtil.getUniqueFileName(

+							getContainerFullPath(), fileName, "comrel")); //$NON-NLS-1$

+				}

+				super.setVisible(visible);

+			}

+		};

+		domainModelFilePage

+				.setTitle(Messages.ComrelCreationWizard_DomainModelFilePageTitle);

+		domainModelFilePage

+				.setDescription(Messages.ComrelCreationWizard_DomainModelFilePageDescription);

+		addPage(domainModelFilePage);

+		customPage = new ComrelCustomCreationWizardPage(

+				"Composite Refactoring Details");

+		customPage.setTitle("Composite Refactoring Details");

+		addPage(customPage);

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public boolean performFinish() {

+		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {

+

+			protected void execute(IProgressMonitor monitor)

+					throws CoreException, InterruptedException {

+				diagram = ComrelDiagramEditorUtil.createDiagram(

+						diagramModelFilePage.getURI(), domainModelFilePage

+								.getURI(), monitor, customPage.getDiagramName()

+								.getText(), customPage.getNamespaceURI()

+								.getText(), customPage

+								.getConnectionVisualization().getText());

+				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {

+					try {

+						ComrelDiagramEditorUtil.openDiagram(diagram);

+					} catch (PartInitException e) {

+						ErrorDialog.openError(getContainer().getShell(),

+								Messages.ComrelCreationWizardOpenEditorError,

+								null, e.getStatus());

+					}

+				}

+			}

+		};

+		try {

+			getContainer().run(false, true, op);

+		} catch (InterruptedException e) {

+			return false;

+		} catch (InvocationTargetException e) {

+			if (e.getTargetException() instanceof CoreException) {

+				ErrorDialog.openError(getContainer().getShell(),

+						Messages.ComrelCreationWizardCreationError, null,

+						((CoreException) e.getTargetException()).getStatus());

+			} else {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Error creating diagram", e.getTargetException()); //$NON-NLS-1$

+			}

+			return false;

+		}

+		return diagram != null;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCreationWizardPage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCreationWizardPage.java
new file mode 100644
index 0000000..e9713a4
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCreationWizardPage.java
@@ -0,0 +1,90 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+/**

+ * @generated

+ */

+public class ComrelCreationWizardPage extends WizardNewFileCreationPage {

+

+	/**

+	 * @generated

+	 */

+	private final String fileExtension;

+

+	/**

+	 * @generated

+	 */

+	public ComrelCreationWizardPage(String pageName,

+			IStructuredSelection selection, String fileExtension) {

+		super(pageName, selection);

+		this.fileExtension = fileExtension;

+	}

+

+	/**

+	 * Override to create files with this extension.

+	 * 

+	 * @generated

+	 */

+	protected String getExtension() {

+		return fileExtension;

+	}

+

+	/**

+	 * @generated

+	 */

+	public URI getURI() {

+		return URI.createPlatformResourceURI(getFilePath().toString(), false);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IPath getFilePath() {

+		IPath path = getContainerFullPath();

+		if (path == null) {

+			path = new Path(""); //$NON-NLS-1$

+		}

+		String fileName = getFileName();

+		if (fileName != null) {

+			path = path.append(fileName);

+		}

+		return path;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void createControl(Composite parent) {

+		super.createControl(parent);

+		setFileName(ComrelDiagramEditorUtil.getUniqueFileName(

+				getContainerFullPath(), getFileName(), getExtension()));

+		setPageComplete(validatePage());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean validatePage() {

+		if (!super.validatePage()) {

+			return false;

+		}

+		String extension = getExtension();

+		if (extension != null

+				&& !getFilePath().toString().endsWith("." + extension)) {

+			setErrorMessage(NLS.bind(

+					Messages.ComrelCreationWizardPageExtensionError, extension));

+			return false;

+		}

+		return true;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCustomCreationWizardPage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCustomCreationWizardPage.java
new file mode 100644
index 0000000..bddd63b
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelCustomCreationWizardPage.java
@@ -0,0 +1,128 @@
+package comrel.diagram.part;

+

+import org.eclipse.jface.wizard.IWizardPage;

+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.Combo;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Event;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Text;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+import comrel.MappingVisualization;

+import comrel.util.RegistryUtil;

+

+public class ComrelCustomCreationWizardPage extends WizardPage {

+

+	private Combo namespaceURI;

+	

+	private Text diagramName;

+	

+	private Combo connectionVisualization;

+	

+	protected ComrelCustomCreationWizardPage(String pageName) {

+		super(pageName);

+	}

+

+	@Override

+	public void createControl(Composite parent) {

+		Composite composite = new Composite(parent,SWT.NONE);

+		GridLayout gl = new GridLayout();

+	    int ncol = 3;

+	    gl.numColumns = ncol;

+	    GridData gridData = new GridData();

+	    new Label (composite, SWT.NONE).setText("Diagram Name:");		

+	    diagramName = new Text(composite, SWT.BORDER);

+	    gridData = new GridData(GridData.FILL_HORIZONTAL);

+	    gridData.horizontalSpan = ncol - 1;

+	    diagramName.setLayoutData(gridData);

+	    gridData.horizontalAlignment = GridData.BEGINNING;

+	    IWizardPage prePage = this.getPreviousPage();

+	    if(prePage instanceof WizardNewFileCreationPage) {

+	    	WizardNewFileCreationPage p = (WizardNewFileCreationPage)prePage;

+	    	String filename = p.getFileName();

+	    	String subString = filename.substring(0,filename.length()-18);

+	    	diagramName.setText(subString);

+	    }

+	    gridData.widthHint = GridData.HORIZONTAL_ALIGN_FILL;

+	    gridData.minimumWidth = GridData.HORIZONTAL_ALIGN_FILL;

+	    new Label (composite, SWT.NONE).setText("NamespaceURI:");						

+	    namespaceURI = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);

+	   	for(String s: RegistryUtil.getNamepsaceURIS()) {

+	   		namespaceURI.add(s);

+	   	}

+	    namespaceURI.setLayoutData(gridData);

+	    namespaceURI.addListener(SWT.Selection, new MyListener());

+	    

+	    new Label (composite, SWT.NONE).setText("Connection Visualization:");

+	    connectionVisualization = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);

+	    for(MappingVisualization m : MappingVisualization.values()) {

+	    	connectionVisualization.add(m.getLiteral());

+	    }

+	    if(connectionVisualization.getItemCount()>0) {

+	    	connectionVisualization.select(0);

+	    }

+	    connectionVisualization.setLayoutData(gridData);

+	    composite.setLayout(gl);

+	    setControl(composite);	    

+	}	

+

+	public Combo getNamespaceURI() {

+		return namespaceURI;

+	}

+

+	public void setNamespaceURI(Combo namespaceURI) {

+		this.namespaceURI = namespaceURI;

+		this.setPageComplete(this.isPageComplete());

+		getWizard().getContainer().updateButtons();

+	}

+

+	public Text getDiagramName() {

+		return diagramName;

+	}

+

+	public void setDiagramName(Text diagramName) {

+		this.diagramName = diagramName;

+	}

+

+	public Combo getConnectionVisualization() {

+		return connectionVisualization;

+	}

+

+	public void setConnectionVisualization(Combo connectionVisualization) {

+		this.connectionVisualization = connectionVisualization;

+	}	

+	

+	@Override

+	public boolean isPageComplete() {

+		return validatePage() && super.isPageComplete();

+	}

+

+	@Override

+	public void setPageComplete(boolean complete) {

+		super.setPageComplete(complete);

+	}

+	

+	public boolean validatePage(){

+		if(this.getNamespaceURI().getSelectionIndex()==-1) {

+			setErrorMessage("NamspaceURI must be set");

+			return false;

+		}

+		setErrorMessage(null);

+		return true;

+	}	

+

+	private class MyListener implements org.eclipse.swt.widgets.Listener{

+

+		@Override

+		public void handleEvent(Event event) {

+		    setPageComplete(validatePage());

+		    getWizard().getContainer().updateButtons();

+		    

+		}

+		

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramActionBarContributor.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramActionBarContributor.java
new file mode 100644
index 0000000..ff1fe40
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramActionBarContributor.java
@@ -0,0 +1,57 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;

+import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.EnhancedPrintActionHelper;

+import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.RenderedPrintPreviewAction;

+import org.eclipse.jface.action.GroupMarker;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IWorkbenchActionConstants;

+import org.eclipse.ui.IWorkbenchPage;

+

+/**

+ * @generated

+ */

+public class ComrelDiagramActionBarContributor extends

+		DiagramActionBarContributor {

+

+	/**

+	 * @generated

+	 */

+	protected Class getEditorClass() {

+		return ComrelDiagramEditor.class;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getEditorId() {

+		return ComrelDiagramEditor.ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init(IActionBars bars, IWorkbenchPage page) {

+		super.init(bars, page);

+		// print preview

+		IMenuManager fileMenu = bars.getMenuManager().findMenuUsingPath(

+				IWorkbenchActionConstants.M_FILE);

+		assert fileMenu != null;

+		IAction printPreviewAction = new RenderedPrintPreviewAction(

+				new EnhancedPrintActionHelper());

+		fileMenu.insertBefore("print", printPreviewAction); //$NON-NLS-1$

+		IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(

+				IWorkbenchActionConstants.M_EDIT);

+		assert editMenu != null;

+		if (editMenu.find("validationGroup") == null) { //$NON-NLS-1$

+			editMenu.add(new GroupMarker("validationGroup")); //$NON-NLS-1$

+		}

+		IAction validateAction = new ValidateAction(page);

+		editMenu.appendToGroup("validationGroup", validateAction); //$NON-NLS-1$

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditor.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditor.java
new file mode 100644
index 0000000..1c57bcc
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditor.java
@@ -0,0 +1,393 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IMarker;

+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.emf.common.ui.URIEditorInput;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gef.palette.PaletteRoot;

+import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramDropTargetListener;

+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.document.IDocumentProvider;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.ErrorDialog;

+import org.eclipse.jface.dialogs.IMessageProvider;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.util.LocalSelectionTransfer;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.window.Window;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.dnd.Transfer;

+import org.eclipse.swt.dnd.TransferData;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorMatchingStrategy;

+import org.eclipse.ui.IEditorReference;

+import org.eclipse.ui.IFileEditorInput;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.dialogs.SaveAsDialog;

+import org.eclipse.ui.ide.IGotoMarker;

+import org.eclipse.ui.navigator.resources.ProjectExplorer;

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.IShowInTargetList;

+import org.eclipse.ui.part.ShowInContext;

+

+import comrel.diagram.navigator.ComrelNavigatorItem;

+

+/**

+ * @generated

+ */

+public class ComrelDiagramEditor extends DiagramDocumentEditor implements

+		IGotoMarker {

+

+	/**

+	 * @generated

+	 */

+	public static final String ID = "comrel.diagram.part.ComrelDiagramEditorID"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final String CONTEXT_ID = "comrel.diagram.ui.diagramContext"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public ComrelDiagramEditor() {

+		super(true);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getContextID() {

+		return CONTEXT_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {

+		PaletteRoot root = super.createPaletteRoot(existingPaletteRoot);

+		new ComrelPaletteFactory().fillPalette(root);

+		return root;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PreferencesHint getPreferencesHint() {

+		return ComrelDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getContributorId() {

+		return ComrelDiagramEditorPlugin.ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	public Object getAdapter(Class type) {

+		if (type == IShowInTargetList.class) {

+			return new IShowInTargetList() {

+				public String[] getShowInTargetIds() {

+					return new String[] { ProjectExplorer.VIEW_ID };

+				}

+			};

+		}

+		return super.getAdapter(type);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IDocumentProvider getDocumentProvider(IEditorInput input) {

+		if (input instanceof IFileEditorInput

+				|| input instanceof URIEditorInput) {

+			return ComrelDiagramEditorPlugin.getInstance()

+					.getDocumentProvider();

+		}

+		return super.getDocumentProvider(input);

+	}

+

+	/**

+	 * @generated

+	 */

+	public TransactionalEditingDomain getEditingDomain() {

+		IDocument document = getEditorInput() != null ? getDocumentProvider()

+				.getDocument(getEditorInput()) : null;

+		if (document instanceof IDiagramDocument) {

+			return ((IDiagramDocument) document).getEditingDomain();

+		}

+		return super.getEditingDomain();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setDocumentProvider(IEditorInput input) {

+		if (input instanceof IFileEditorInput

+				|| input instanceof URIEditorInput) {

+			setDocumentProvider(ComrelDiagramEditorPlugin.getInstance()

+					.getDocumentProvider());

+		} else {

+			super.setDocumentProvider(input);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void gotoMarker(IMarker marker) {

+		MarkerNavigationService.getInstance().gotoMarker(this, marker);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isSaveAsAllowed() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void doSaveAs() {

+		performSaveAs(new NullProgressMonitor());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performSaveAs(IProgressMonitor progressMonitor) {

+		Shell shell = getSite().getShell();

+		IEditorInput input = getEditorInput();

+		SaveAsDialog dialog = new SaveAsDialog(shell);

+		IFile original = input instanceof IFileEditorInput ? ((IFileEditorInput) input)

+				.getFile() : null;

+		if (original != null) {

+			dialog.setOriginalFile(original);

+		}

+		dialog.create();

+		IDocumentProvider provider = getDocumentProvider();

+		if (provider == null) {

+			// editor has been programmatically closed while the dialog was open

+			return;

+		}

+		if (provider.isDeleted(input) && original != null) {

+			String message = NLS.bind(

+					Messages.ComrelDiagramEditor_SavingDeletedFile,

+					original.getName());

+			dialog.setErrorMessage(null);

+			dialog.setMessage(message, IMessageProvider.WARNING);

+		}

+		if (dialog.open() == Window.CANCEL) {

+			if (progressMonitor != null) {

+				progressMonitor.setCanceled(true);

+			}

+			return;

+		}

+		IPath filePath = dialog.getResult();

+		if (filePath == null) {

+			if (progressMonitor != null) {

+				progressMonitor.setCanceled(true);

+			}

+			return;

+		}

+		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();

+		IFile file = workspaceRoot.getFile(filePath);

+		final IEditorInput newInput = new FileEditorInput(file);

+		// Check if the editor is already open

+		IEditorMatchingStrategy matchingStrategy = getEditorDescriptor()

+				.getEditorMatchingStrategy();

+		IEditorReference[] editorRefs = PlatformUI.getWorkbench()

+				.getActiveWorkbenchWindow().getActivePage()

+				.getEditorReferences();

+		for (int i = 0; i < editorRefs.length; i++) {

+			if (matchingStrategy.matches(editorRefs[i], newInput)) {

+				MessageDialog.openWarning(shell,

+						Messages.ComrelDiagramEditor_SaveAsErrorTitle,

+						Messages.ComrelDiagramEditor_SaveAsErrorMessage);

+				return;

+			}

+		}

+		boolean success = false;

+		try {

+			provider.aboutToChange(newInput);

+			getDocumentProvider(newInput).saveDocument(progressMonitor,

+					newInput,

+					getDocumentProvider().getDocument(getEditorInput()), true);

+			success = true;

+		} catch (CoreException x) {

+			IStatus status = x.getStatus();

+			if (status == null || status.getSeverity() != IStatus.CANCEL) {

+				ErrorDialog.openError(shell,

+						Messages.ComrelDiagramEditor_SaveErrorTitle,

+						Messages.ComrelDiagramEditor_SaveErrorMessage,

+						x.getStatus());

+			}

+		} finally {

+			provider.changed(newInput);

+			if (success) {

+				setInput(newInput);

+			}

+		}

+		if (progressMonitor != null) {

+			progressMonitor.setCanceled(!success);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public ShowInContext getShowInContext() {

+		return new ShowInContext(getEditorInput(), getNavigatorSelection());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ISelection getNavigatorSelection() {

+		IDiagramDocument document = getDiagramDocument();

+		if (document == null) {

+			return StructuredSelection.EMPTY;

+		}

+		Diagram diagram = document.getDiagram();

+		IFile file = WorkspaceSynchronizer.getFile(diagram.eResource());

+		if (file != null) {

+			ComrelNavigatorItem item = new ComrelNavigatorItem(diagram, file,

+					false);

+			return new StructuredSelection(item);

+		}

+		return StructuredSelection.EMPTY;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void configureGraphicalViewer() {

+		super.configureGraphicalViewer();

+		DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(

+				this, getDiagramGraphicalViewer());

+		getDiagramGraphicalViewer().setContextMenu(provider);

+		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU,

+				provider, getDiagramGraphicalViewer());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeGraphicalViewer() {

+		super.initializeGraphicalViewer();

+		getDiagramGraphicalViewer().addDropTargetListener(

+				new DropTargetListener(getDiagramGraphicalViewer(),

+						LocalSelectionTransfer.getTransfer()) {

+

+					protected Object getJavaObject(TransferData data) {

+						return LocalSelectionTransfer.getTransfer()

+								.nativeToJava(data);

+					}

+

+				});

+		getDiagramGraphicalViewer().addDropTargetListener(

+				new DropTargetListener(getDiagramGraphicalViewer(),

+						LocalTransfer.getInstance()) {

+

+					protected Object getJavaObject(TransferData data) {

+						return LocalTransfer.getInstance().nativeToJava(data);

+					}

+

+				});

+	}

+

+	/**

+	 * @generated

+	 */

+	private abstract class DropTargetListener extends DiagramDropTargetListener {

+

+		/**

+		 * @generated

+		 */

+		public DropTargetListener(EditPartViewer viewer, Transfer xfer) {

+			super(viewer, xfer);

+		}

+

+		/**

+		 * @generated

+		 */

+		protected List getObjectsBeingDropped() {

+			TransferData data = getCurrentEvent().currentDataType;

+			HashSet<URI> uris = new HashSet<URI>();

+

+			Object transferedObject = getJavaObject(data);

+			if (transferedObject instanceof IStructuredSelection) {

+				IStructuredSelection selection = (IStructuredSelection) transferedObject;

+				for (Iterator<?> it = selection.iterator(); it.hasNext();) {

+					Object nextSelectedObject = it.next();

+					if (nextSelectedObject instanceof ComrelNavigatorItem) {

+						View view = ((ComrelNavigatorItem) nextSelectedObject)

+								.getView();

+						nextSelectedObject = view.getElement();

+					} else if (nextSelectedObject instanceof IAdaptable) {

+						IAdaptable adaptable = (IAdaptable) nextSelectedObject;

+						nextSelectedObject = adaptable

+								.getAdapter(EObject.class);

+					}

+

+					if (nextSelectedObject instanceof EObject) {

+						EObject modelElement = (EObject) nextSelectedObject;

+						uris.add(EcoreUtil.getURI(modelElement));

+					}

+				}

+			}

+

+			ArrayList<EObject> result = new ArrayList<EObject>(uris.size());

+			for (URI nextURI : uris) {

+				EObject modelObject = getEditingDomain().getResourceSet()

+						.getEObject(nextURI, true);

+				result.add(modelObject);

+			}

+			return result;

+		}

+

+		/**

+		 * @generated

+		 */

+		protected abstract Object getJavaObject(TransferData data);

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditorPlugin.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditorPlugin.java
new file mode 100644
index 0000000..af7fc0d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditorPlugin.java
@@ -0,0 +1,316 @@
+/*

+ * 

+ */

+package comrel.diagram.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.Platform;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.emf.common.notify.AdapterFactory;

+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.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.osgi.framework.BundleContext;

+

+import comrel.diagram.edit.policies.ComrelBaseItemSemanticEditPolicy;

+import comrel.diagram.expressions.ComrelOCLFactory;

+import comrel.diagram.providers.ElementInitializers;

+import comrel.provider.ComrelItemProviderAdapterFactory;

+

+/**

+ * @generated

+ */

+public class ComrelDiagramEditorPlugin extends AbstractUIPlugin {

+

+	/**

+	 * @generated

+	 */

+	public static final String ID = "org.eclipse.emf.refactor.comrel.diagram"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(

+			ID);

+

+	/**

+	 * @generated

+	 */

+	private static ComrelDiagramEditorPlugin instance;

+

+	/**

+	 * @generated

+	 */

+	private ComposedAdapterFactory adapterFactory;

+

+	/**

+	 * @generated

+	 */

+	private ComrelDocumentProvider documentProvider;

+

+	/**

+	 * @generated

+	 */

+	private ComrelBaseItemSemanticEditPolicy.LinkConstraints linkConstraints;

+

+	/**

+	 * @generated

+	 */

+	private ElementInitializers initializers;

+

+	/**

+	 * @generated

+	 */

+	private ComrelOCLFactory oclFactory;

+

+	/**

+	 * @generated

+	 */

+	public ComrelDiagramEditorPlugin() {

+	}

+

+	/**

+	 * @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;

+		linkConstraints = null;

+		initializers = null;

+		oclFactory = null;

+		instance = null;

+		super.stop(context);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ComrelDiagramEditorPlugin getInstance() {

+		return instance;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ComposedAdapterFactory createAdapterFactory() {

+		ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();

+		fillItemProviderFactories(factories);

+		return new ComposedAdapterFactory(factories);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void fillItemProviderFactories(List<AdapterFactory> factories) {

+		factories.add(new ComrelItemProviderAdapterFactory());

+		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;

+	}

+

+	/**

+	 * Returns string from plug-in's resource bundle

+	 *

+	 * @generated

+	 */

+	public static String getString(String key) {

+		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComrelDocumentProvider getDocumentProvider() {

+		if (documentProvider == null) {

+			documentProvider = new ComrelDocumentProvider();

+		}

+		return documentProvider;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComrelBaseItemSemanticEditPolicy.LinkConstraints getLinkConstraints() {

+		return linkConstraints;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLinkConstraints(

+			ComrelBaseItemSemanticEditPolicy.LinkConstraints lc) {

+		this.linkConstraints = lc;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ElementInitializers getElementInitializers() {

+		return initializers;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setElementInitializers(ElementInitializers i) {

+		this.initializers = i;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComrelOCLFactory getComrelOCLFactory() {

+		return oclFactory;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setComrelOCLFactory(ComrelOCLFactory f) {

+		this.oclFactory = f;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logError(String error) {

+		logError(error, null);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logError(String error, Throwable throwable) {

+		if (error == null && throwable != null) {

+			error = throwable.getMessage();

+		}

+		getLog().log(

+				new Status(IStatus.ERROR, ComrelDiagramEditorPlugin.ID,

+						IStatus.OK, error, throwable));

+		debug(error, throwable);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logInfo(String message) {

+		logInfo(message, null);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logInfo(String message, Throwable throwable) {

+		if (message == null && throwable != null) {

+			message = throwable.getMessage();

+		}

+		getLog().log(

+				new Status(IStatus.INFO, ComrelDiagramEditorPlugin.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/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditorUtil.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditorUtil.java
new file mode 100644
index 0000000..a148f64
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramEditorUtil.java
@@ -0,0 +1,495 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.io.IOException;

+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 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.IResource;

+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.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.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.xmi.XMLResource;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.IDialogSettings;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.jface.wizard.WizardDialog;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.part.FileEditorInput;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelFactory;

+import comrel.MappingVisualization;

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+

+/**

+ * @generated

+ */

+public class ComrelDiagramEditorUtil {

+

+	public static final String DEFAULT_FILENAME = "compositeRefactoring";

+

+	/**

+	 * @generated

+	 */

+	public static Map<?, ?> getSaveOptions() {

+		HashMap<String, Object> saveOptions = new HashMap<String, Object>();

+		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$

+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED,

+				Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

+		return saveOptions;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean openDiagram(Resource diagram)

+			throws PartInitException {

+		String path = diagram.getURI().toPlatformString(true);

+		IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot()

+				.findMember(new Path(path));

+		if (workspaceResource instanceof IFile) {

+			IWorkbenchPage page = PlatformUI.getWorkbench()

+					.getActiveWorkbenchWindow().getActivePage();

+			return null != page.openEditor(new FileEditorInput(

+					(IFile) workspaceResource), ComrelDiagramEditor.ID);

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void setCharset(IFile file) {

+		if (file == null) {

+			return;

+		}

+		try {

+			file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$

+		} catch (CoreException e) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	public static String getUniqueFileName(IPath containerFullPath,

+			String fileName, String extension) {

+		if (containerFullPath == null) {

+			containerFullPath = new Path(""); //$NON-NLS-1$

+		}

+		if (fileName == null || fileName.trim().length() == 0) {

+			fileName = DEFAULT_FILENAME; //$NON-NLS-1$

+		}

+		IPath filePath = containerFullPath.append(fileName);

+		if (extension != null && !extension.equals(filePath.getFileExtension())) {

+			filePath = filePath.addFileExtension(extension);

+		}

+		extension = filePath.getFileExtension();

+		fileName = filePath.removeFileExtension().lastSegment();

+		int i = 1;

+		while (ResourcesPlugin.getWorkspace().getRoot().exists(filePath)) {

+			i++;

+			filePath = containerFullPath.append(fileName + i);

+			if (extension != null) {

+				filePath = filePath.addFileExtension(extension);

+			}

+		}

+		return filePath.lastSegment();

+	}

+

+	/**

+	 * Runs the wizard in a dialog.

+	 * 

+	 * @generated

+	 */

+	public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {

+		IDialogSettings pluginDialogSettings = ComrelDiagramEditorPlugin

+				.getInstance().getDialogSettings();

+		IDialogSettings wizardDialogSettings = pluginDialogSettings

+				.getSection(settingsKey);

+		if (wizardDialogSettings == null) {

+			wizardDialogSettings = pluginDialogSettings

+					.addNewSection(settingsKey);

+		}

+		wizard.setDialogSettings(wizardDialogSettings);

+		WizardDialog dialog = new WizardDialog(shell, wizard);

+		dialog.create();

+		dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x),

+				500);

+		dialog.open();

+	}

+

+	/**

+	 * This method should be called within a workspace modify operation since it 

+	 * creates resources.

+	 * 

+	 * @generated NOT

+	 */

+	public static Resource createDiagram(URI diagramURI, URI modelURI,

+			IProgressMonitor progressMonitor) {

+		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE

+				.createEditingDomain();

+		progressMonitor.beginTask(

+				Messages.ComrelDiagramEditorUtil_CreateDiagramProgressTask, 3);

+		final Resource diagramResource = editingDomain.getResourceSet()

+				.createResource(diagramURI);

+		final Resource modelResource = editingDomain.getResourceSet()

+				.createResource(modelURI);

+		final String diagramName = diagramURI.lastSegment();

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(

+				editingDomain,

+				Messages.ComrelDiagramEditorUtil_CreateDiagramCommandLabel,

+				Collections.EMPTY_LIST) {

+			protected CommandResult doExecuteWithResult(

+					IProgressMonitor monitor, IAdaptable info)

+					throws ExecutionException {

+				CompositeRefactoring model = createInitialModel();

+				attachModelToResource(model, modelResource);

+

+				Diagram diagram = ViewService.createDiagram(model,

+						CompositeRefactoringEditPart.MODEL_ID,

+						ComrelDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				if (diagram != null) {

+					diagramResource.getContents().add(diagram);

+					diagram.setName(diagramName);

+					diagram.setElement(model);

+				}

+

+				try {

+					modelResource

+							.save(comrel.diagram.part.ComrelDiagramEditorUtil

+									.getSaveOptions());

+					diagramResource

+							.save(comrel.diagram.part.ComrelDiagramEditorUtil

+									.getSaveOptions());

+				} catch (IOException e) {

+

+					ComrelDiagramEditorPlugin.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) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Unable to create model and diagram", e); //$NON-NLS-1$

+		}

+		setCharset(WorkspaceSynchronizer.getFile(modelResource));

+		setCharset(WorkspaceSynchronizer.getFile(diagramResource));

+		return diagramResource;

+	}

+

+	/**

+	 * This method should be called within a workspace modify operation since it

+	 * creates resources.

+	 * 

+	 */

+	public static Resource createDiagram(URI diagramURI, URI modelURI,

+			IProgressMonitor progressMonitor, final String customDiagramName,

+			final String namespaceURI, final String connectionVisualization) {

+		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE

+				.createEditingDomain();

+		progressMonitor.beginTask(

+				Messages.ComrelDiagramEditorUtil_CreateDiagramProgressTask, 3);

+		final Resource diagramResource = editingDomain.getResourceSet()

+				.createResource(diagramURI);

+		final Resource modelResource = editingDomain.getResourceSet()

+				.createResource(modelURI);

+		final String diagramName = diagramURI.lastSegment();

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(

+				editingDomain,

+				Messages.ComrelDiagramEditorUtil_CreateDiagramCommandLabel,

+				Collections.EMPTY_LIST) {

+			protected CommandResult doExecuteWithResult(

+					IProgressMonitor monitor, IAdaptable info)

+					throws ExecutionException {

+				CompositeRefactoring model = createInitialModel();

+				attachModelToResource(model, modelResource);

+				if (customDiagramName == null) {

+					model.setName("");

+				} else {

+					model.setName(customDiagramName.trim());

+				}

+				model.setNamespaceUri(namespaceURI);

+				model.setMappingVisualization(MappingVisualization

+						.get(connectionVisualization));

+				Diagram diagram = ViewService.createDiagram(model,

+						CompositeRefactoringEditPart.MODEL_ID,

+						ComrelDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				if (diagram != null) {

+					diagramResource.getContents().add(diagram);

+					diagram.setName(diagramName);

+					diagram.setElement(model);

+				}

+

+				try {

+					modelResource

+							.save(comrel.diagram.part.ComrelDiagramEditorUtil

+									.getSaveOptions());

+					diagramResource

+							.save(comrel.diagram.part.ComrelDiagramEditorUtil

+									.getSaveOptions());

+				} catch (IOException e) {

+

+					ComrelDiagramEditorPlugin.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) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Unable to create model and diagram", e); //$NON-NLS-1$

+		}

+		setCharset(WorkspaceSynchronizer.getFile(modelResource));

+		setCharset(WorkspaceSynchronizer.getFile(diagramResource));

+		return diagramResource;

+	}

+

+	/**

+	 * Create a new instance of domain element associated with canvas.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static CompositeRefactoring createInitialModel() {

+		return ComrelFactory.eINSTANCE.createCompositeRefactoring();

+	}

+

+	/**

+	 * Store model element in the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static void attachModelToResource(CompositeRefactoring model,

+			Resource resource) {

+		resource.getContents().add(model);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void selectElementsInDiagram(

+			IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {

+		diagramPart.getDiagramGraphicalViewer().deselectAll();

+

+		EditPart firstPrimary = null;

+		for (EditPart nextPart : editParts) {

+			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);

+			if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {

+				firstPrimary = nextPart;

+			}

+		}

+

+		if (!editParts.isEmpty()) {

+			diagramPart.getDiagramGraphicalViewer().reveal(

+					firstPrimary != null ? firstPrimary : (EditPart) editParts

+							.get(0));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static int findElementsInDiagramByID(DiagramEditPart diagramPart,

+			EObject element, List<EditPart> editPartCollector) {

+		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart

+				.getViewer();

+		final int intialNumOfEditParts = editPartCollector.size();

+

+		if (element instanceof View) { // support notation element lookup

+			EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(

+					element);

+			if (editPart != null) {

+				editPartCollector.add(editPart);

+				return 1;

+			}

+		}

+

+		String elementID = EMFCoreUtil.getProxyID(element);

+		@SuppressWarnings("unchecked")

+		List<EditPart> associatedParts = viewer.findEditPartsForElement(

+				elementID, IGraphicalEditPart.class);

+		// perform the possible hierarchy disjoint -> take the top-most parts only

+		for (EditPart nextPart : associatedParts) {

+			EditPart parentPart = nextPart.getParent();

+			while (parentPart != null && !associatedParts.contains(parentPart)) {

+				parentPart = parentPart.getParent();

+			}

+			if (parentPart == null) {

+				editPartCollector.add(nextPart);

+			}

+		}

+

+		if (intialNumOfEditParts == editPartCollector.size()) {

+			if (!associatedParts.isEmpty()) {

+				editPartCollector.add(associatedParts.get(0));

+			} else {

+				if (element.eContainer() != null) {

+					return findElementsInDiagramByID(diagramPart,

+							element.eContainer(), editPartCollector);

+				}

+			}

+		}

+		return editPartCollector.size() - intialNumOfEditParts;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static View findView(DiagramEditPart diagramEditPart,

+			EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) {

+		boolean hasStructuralURI = false;

+		if (targetElement.eResource() instanceof XMLResource) {

+			hasStructuralURI = ((XMLResource) targetElement.eResource())

+					.getID(targetElement) == null;

+		}

+

+		View view = null;

+		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();

+		if (hasStructuralURI

+				&& !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {

+			view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);

+		} else if (findElementsInDiagramByID(diagramEditPart, targetElement,

+				editPartHolder) > 0) {

+			EditPart editPart = editPartHolder.get(0);

+			view = editPart.getModel() instanceof View ? (View) editPart

+					.getModel() : null;

+		}

+

+		return (view == null) ? diagramEditPart.getDiagramView() : view;

+	}

+

+	/**

+	 * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon

+	 * @generated

+	 */

+	public static class LazyElement2ViewMap {

+		/**

+		 * @generated

+		 */

+		private Map<EObject, View> element2ViewMap;

+

+		/**

+		 * @generated

+		 */

+		private View scope;

+

+		/**

+		 * @generated

+		 */

+		private Set<? extends EObject> elementSet;

+

+		/**

+		 * @generated

+		 */

+		public LazyElement2ViewMap(View scope, Set<? extends EObject> elements) {

+			this.scope = scope;

+			this.elementSet = elements;

+		}

+

+		/**

+		 * @generated

+		 */

+		public final Map<EObject, View> getElement2ViewMap() {

+			if (element2ViewMap == null) {

+				element2ViewMap = new HashMap<EObject, View>();

+				// map possible notation elements to itself as these can't be found by view.getElement()

+				for (EObject element : elementSet) {

+					if (element instanceof View) {

+						View view = (View) element;

+						if (view.getDiagram() == scope.getDiagram()) {

+							element2ViewMap.put(element, view); // take only those that part of our diagram

+						}

+					}

+				}

+

+				buildElement2ViewMap(scope, element2ViewMap, elementSet);

+			}

+			return element2ViewMap;

+		}

+

+		/**

+		 * @generated

+		 */

+		private static boolean buildElement2ViewMap(View parentView,

+				Map<EObject, View> element2ViewMap,

+				Set<? extends EObject> elements) {

+			if (elements.size() == element2ViewMap.size()) {

+				return true;

+			}

+

+			if (parentView.isSetElement()

+					&& !element2ViewMap.containsKey(parentView.getElement())

+					&& elements.contains(parentView.getElement())) {

+				element2ViewMap.put(parentView.getElement(), parentView);

+				if (elements.size() == element2ViewMap.size()) {

+					return true;

+				}

+			}

+			boolean complete = false;

+			for (Iterator<?> it = parentView.getChildren().iterator(); it

+					.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View) it.next(),

+						element2ViewMap, elements);

+			}

+			for (Iterator<?> it = parentView.getSourceEdges().iterator(); it

+					.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View) it.next(),

+						element2ViewMap, elements);

+			}

+			for (Iterator<?> it = parentView.getTargetEdges().iterator(); it

+					.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View) it.next(),

+						element2ViewMap, elements);

+			}

+			return complete;

+		}

+	} //LazyElement2ViewMap	

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramUpdateCommand.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramUpdateCommand.java
new file mode 100644
index 0000000..e92df50
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramUpdateCommand.java
@@ -0,0 +1,88 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.IHandler;

+import org.eclipse.core.commands.IHandlerListener;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * @generated

+ */

+public class ComrelDiagramUpdateCommand implements IHandler {

+

+	/**

+	 * @generated

+	 */

+	public void addHandlerListener(IHandlerListener handlerListener) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void dispose() {

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		ISelection selection = PlatformUI.getWorkbench()

+				.getActiveWorkbenchWindow().getSelectionService()

+				.getSelection();

+		if (selection instanceof IStructuredSelection) {

+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

+			if (structuredSelection.size() != 1) {

+				return null;

+			}

+			if (structuredSelection.getFirstElement() instanceof EditPart

+					&& ((EditPart) structuredSelection.getFirstElement())

+							.getModel() instanceof View) {

+				EObject modelElement = ((View) ((EditPart) structuredSelection

+						.getFirstElement()).getModel()).getElement();

+				List editPolicies = CanonicalEditPolicy

+						.getRegisteredEditPolicies(modelElement);

+				for (Iterator it = editPolicies.iterator(); it.hasNext();) {

+					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it

+							.next();

+					nextEditPolicy.refresh();

+				}

+

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isEnabled() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isHandled() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void removeHandlerListener(IHandlerListener handlerListener) {

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramUpdater.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramUpdater.java
new file mode 100644
index 0000000..eec11e8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDiagramUpdater.java
@@ -0,0 +1,8850 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.util.Collection;

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.AtomicUnit;

+import comrel.CartesianQueuedUnit;

+import comrel.CompositeRefactoring;

+import comrel.ComrelPackage;

+import comrel.ConditionCheck;

+import comrel.ConditionalUnit;

+import comrel.HelperUnit;

+import comrel.InputPort;

+import comrel.MultiFeatureUnit;

+import comrel.MultiFilterUnit;

+import comrel.MultiInputPort;

+import comrel.MultiOutputPort;

+import comrel.MultiPort;

+import comrel.MultiPortMapping;

+import comrel.MultiSinglePortMapping;

+import comrel.ParallelQueuedUnit;

+import comrel.RefactoringUnit;

+import comrel.SequentialUnit;

+import comrel.SingleFeatureUnit;

+import comrel.SingleFilterUnit;

+import comrel.SingleInputPort;

+import comrel.SingleOutputPort;

+import comrel.SinglePort;

+import comrel.SinglePortMapping;

+import comrel.SingleQueuedUnit;

+import comrel.diagram.edit.parts.*;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ComrelDiagramUpdater {

+

+	/**

+	 * @generated

+	 */

+	public static boolean isShortcutOrphaned(View view) {

+		return !view.isSetElement() || view.getElement() == null

+				|| view.getElement().eIsProxy();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSemanticChildren(View view) {

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+		case CompositeRefactoringEditPart.VISUAL_ID:

+			return getCompositeRefactoring_1000SemanticChildren(view);

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_2002SemanticChildren(view);

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return getParallelQueuedUnit_2003SemanticChildren(view);

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return getSingleQueuedUnit_2004SemanticChildren(view);

+		case SequentialUnitEditPart.VISUAL_ID:

+			return getSequentialUnit_2005SemanticChildren(view);

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return getConditionalUnit_2006SemanticChildren(view);

+		case AtomicUnitEditPart.VISUAL_ID:

+			return getAtomicUnit_2007SemanticChildren(view);

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3003SemanticChildren(view);

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3004SemanticChildren(view);

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3007SemanticChildren(view);

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3008SemanticChildren(view);

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3012SemanticChildren(view);

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return getSingleFilterUnit_3016SemanticChildren(view);

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return getMultiFilterUnit_3019SemanticChildren(view);

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3022SemanticChildren(view);

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3025SemanticChildren(view);

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return getSequentialUnit_3026SemanticChildren(view);

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3029SemanticChildren(view);

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return getConditionalUnit_3030SemanticChildren(view);

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3033SemanticChildren(view);

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return getAtomicUnit_3034SemanticChildren(view);

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3036SemanticChildren(view);

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3037SemanticChildren(view);

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3038SemanticChildren(view);

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3039SemanticChildren(view);

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3040SemanticChildren(view);

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3041SemanticChildren(view);

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3042SemanticChildren(view);

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3043SemanticChildren(view);

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return getSequentialUnit_3044SemanticChildren(view);

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3045SemanticChildren(view);

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return getConditionalUnit_3046SemanticChildren(view);

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3047SemanticChildren(view);

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3048SemanticChildren(view);

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return getAtomicUnit_3049SemanticChildren(view);

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3050SemanticChildren(view);

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3051SemanticChildren(view);

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3052SemanticChildren(view);

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3053SemanticChildren(view);

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3054SemanticChildren(view);

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3055SemanticChildren(view);

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3056SemanticChildren(view);

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3057SemanticChildren(view);

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3058SemanticChildren(view);

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3059SemanticChildren(view);

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return getSequentialUnit_3060SemanticChildren(view);

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3061SemanticChildren(view);

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3062SemanticChildren(view);

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3063SemanticChildren(view);

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3064SemanticChildren(view);

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3065SemanticChildren(view);

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return getConditionalUnit_3066SemanticChildren(view);

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3067SemanticChildren(view);

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return getAtomicUnit_3068SemanticChildren(view);

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return getSequentialUnit_3069SemanticChildren(view);

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return getSequentialUnit_3070SemanticChildren(view);

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return getConditionalUnit_3071SemanticChildren(view);

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return getConditionalUnit_3072SemanticChildren(view);

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return getSequentialUnit_3073SemanticChildren(view);

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return getAtomicUnit_3074SemanticChildren(view);

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return getConditionalUnit_3075SemanticChildren(view);

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return getAtomicUnit_3077SemanticChildren(view);

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return getAtomicUnit_3078SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7001SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7002SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7003SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7004SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7005SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7006SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7007SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7008SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7009SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7010SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7011SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7012SemanticChildren(view);

+		case SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitHelperUnitsCompartment_7013SemanticChildren(view);

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7014SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7015SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7016SemanticChildren(view);

+		case ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitIfCompartment_7017SemanticChildren(view);

+		case ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitHelperUnitsCompartment_7018SemanticChildren(view);

+		case ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitThenCompartment_7019SemanticChildren(view);

+		case ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitElseCompartment_7020SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7021SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7022SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7023SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7024SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7025SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7026SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7027SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7028SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7029SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7030SemanticChildren(view);

+		case SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitHelperUnitsCompartment_7031SemanticChildren(view);

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7032SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7033SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7034SemanticChildren(view);

+		case ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitIfCompartment_7035SemanticChildren(view);

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitHelperUnitsCompartment_7036SemanticChildren(view);

+		case ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitThenCompartment_7037SemanticChildren(view);

+		case ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitElseCompartment_7038SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7039SemanticChildren(view);

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7040SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7041SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7042SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7043SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7044SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7045SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7046SemanticChildren(view);

+		case SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitHelperUnitsCompartment_7047SemanticChildren(view);

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7048SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7049SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7050SemanticChildren(view);

+		case ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitIfCompartment_7051SemanticChildren(view);

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitHelperUnitsCompartment_7052SemanticChildren(view);

+		case ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitThenCompartment_7053SemanticChildren(view);

+		case ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitElseCompartment_7054SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7055SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7056SemanticChildren(view);

+		case SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitHelperUnitsCompartment_7057SemanticChildren(view);

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7058SemanticChildren(view);

+		case SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitHelperUnitsCompartment_7059SemanticChildren(view);

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7060SemanticChildren(view);

+		case ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitIfCompartment_7061SemanticChildren(view);

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitHelperUnitsCompartment_7062SemanticChildren(view);

+		case ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitThenCompartment_7063SemanticChildren(view);

+		case ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitElseCompartment_7064SemanticChildren(view);

+		case ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitIfCompartment_7065SemanticChildren(view);

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitHelperUnitsCompartment_7066SemanticChildren(view);

+		case ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitThenCompartment_7067SemanticChildren(view);

+		case ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitElseCompartment_7068SemanticChildren(view);

+		case SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitHelperUnitsCompartment_7069SemanticChildren(view);

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7070SemanticChildren(view);

+		case ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitIfCompartment_7071SemanticChildren(view);

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitHelperUnitsCompartment_7072SemanticChildren(view);

+		case ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitThenCompartment_7073SemanticChildren(view);

+		case ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitElseCompartment_7074SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7075SemanticChildren(view);

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+			return getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7076SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7077SemanticChildren(view);

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+			return getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7078SemanticChildren(view);

+		case SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitHelperUnitsCompartment_7079SemanticChildren(view);

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+			return getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7080SemanticChildren(view);

+		case ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitIfCompartment_7081SemanticChildren(view);

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitHelperUnitsCompartment_7082SemanticChildren(view);

+		case ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitThenCompartment_7083SemanticChildren(view);

+		case ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID:

+			return getConditionalUnitConditionalUnitElseCompartment_7084SemanticChildren(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCompositeRefactoring_1000SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CompositeRefactoring modelElement = (CompositeRefactoring) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			RefactoringUnit childElement = modelElement

+					.getMainRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnit_2002SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnit_2003SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnit_2004SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiInputPort childElement = modelElement.getMultiInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnit_2005SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnit_2006SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getAtomicUnit_2007SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		AtomicUnit modelElement = (AtomicUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnit_3003SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnit_3004SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnit_3007SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFeatureUnit_3008SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFeatureUnit modelElement = (SingleFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFeatureUnit_3012SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFeatureUnit modelElement = (MultiFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFilterUnit_3016SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFilterUnit modelElement = (SingleFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFilterUnit_3019SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFilterUnit modelElement = (MultiFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnit_3022SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiInputPort childElement = modelElement.getMultiInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnit_3025SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnit_3026SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnit_3029SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnit_3030SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnit_3033SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getAtomicUnit_3034SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		AtomicUnit modelElement = (AtomicUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnit_3036SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnit_3037SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFeatureUnit_3038SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFeatureUnit modelElement = (SingleFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFeatureUnit_3039SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFeatureUnit modelElement = (MultiFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFilterUnit_3040SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFilterUnit modelElement = (SingleFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFilterUnit_3041SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFilterUnit modelElement = (MultiFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnit_3042SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiInputPort childElement = modelElement.getMultiInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnit_3043SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnit_3044SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnit_3045SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnit_3046SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnit_3047SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnit_3048SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) view

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for (Iterator<?> it = modelElement.getMultiInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getAtomicUnit_3049SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		AtomicUnit modelElement = (AtomicUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFeatureUnit_3050SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFeatureUnit modelElement = (SingleFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFeatureUnit_3051SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFeatureUnit modelElement = (MultiFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFilterUnit_3052SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFilterUnit modelElement = (SingleFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFilterUnit_3053SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFilterUnit modelElement = (MultiFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnit_3054SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiInputPort childElement = modelElement.getMultiInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFeatureUnit_3055SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFeatureUnit modelElement = (SingleFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFeatureUnit_3056SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFeatureUnit modelElement = (MultiFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFilterUnit_3057SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFilterUnit modelElement = (SingleFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFilterUnit_3058SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFilterUnit modelElement = (MultiFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnit_3059SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiInputPort childElement = modelElement.getMultiInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnit_3060SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFeatureUnit_3061SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFeatureUnit modelElement = (SingleFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFeatureUnit_3062SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFeatureUnit modelElement = (MultiFeatureUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			SingleInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		for (Iterator<?> it = modelElement.getSecondaryInputPorts().iterator(); it

+				.hasNext();) {

+			MultiInputPort childElement = (MultiInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPortEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleFilterUnit_3063SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleFilterUnit modelElement = (SingleFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			SingleOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getMultiFilterUnit_3064SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		MultiFilterUnit modelElement = (MultiFilterUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			MultiInputPort childElement = modelElement.getInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		{

+			MultiOutputPort childElement = modelElement.getOutputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiOutputPort2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnit_3065SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiInputPort childElement = modelElement.getMultiInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnit_3066SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnit_3067SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getSingleInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		{

+			MultiInputPort childElement = modelElement.getMultiInputPort();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == MultiInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getAtomicUnit_3068SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		AtomicUnit modelElement = (AtomicUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnit_3069SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnit_3070SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnit_3071SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnit_3072SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnit_3073SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getAtomicUnit_3074SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		AtomicUnit modelElement = (AtomicUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnit_3075SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			InputPort childElement = (InputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort8EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getAtomicUnit_3077SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		AtomicUnit modelElement = (AtomicUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getAtomicUnit_3078SemanticChildren(

+			View view) {

+		if (!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		AtomicUnit modelElement = (AtomicUnit) view.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getInputPorts().iterator(); it

+				.hasNext();) {

+			SingleInputPort childElement = (SingleInputPort) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleInputPort9EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7001SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7002SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7003SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7004SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7005SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7006SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnits();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7007SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7008SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7009SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7010SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7011SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7012SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitHelperUnitsCompartment_7013SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7014SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getRefactoringUnits().iterator(); it

+				.hasNext();) {

+			RefactoringUnit childElement = (RefactoringUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ParallelQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SequentialUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ConditionalUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == AtomicUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7015SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7016SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitIfCompartment_7017SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			ConditionCheck childElement = modelElement.getIf();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == ConditionCheckEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitHelperUnitsCompartment_7018SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitThenCompartment_7019SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getThen();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitElseCompartment_7020SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getElse();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7021SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7022SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7023SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7024SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnits();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7025SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7026SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnits();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7027SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7028SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7029SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7030SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnits();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitHelperUnitsCompartment_7031SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7032SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getRefactoringUnits().iterator(); it

+				.hasNext();) {

+			RefactoringUnit childElement = (RefactoringUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ParallelQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SequentialUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ConditionalUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == AtomicUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7033SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7034SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnits();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitIfCompartment_7035SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			ConditionCheck childElement = modelElement.getIf();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == ConditionCheckEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitHelperUnitsCompartment_7036SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitThenCompartment_7037SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getThen();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitElseCompartment_7038SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getElse();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment_7039SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnitEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getCartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment_7040SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		CartesianQueuedUnit modelElement = (CartesianQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7041SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7042SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnits();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7043SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7044SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7045SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7046SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitHelperUnitsCompartment_7047SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7048SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getRefactoringUnits().iterator(); it

+				.hasNext();) {

+			RefactoringUnit childElement = (RefactoringUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ParallelQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SequentialUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ConditionalUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == AtomicUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7049SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7050SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitIfCompartment_7051SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			ConditionCheck childElement = modelElement.getIf();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == ConditionCheckEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitHelperUnitsCompartment_7052SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitThenCompartment_7053SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getThen();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitElseCompartment_7054SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getElse();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7055SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7056SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitHelperUnitsCompartment_7057SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7058SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getRefactoringUnits().iterator(); it

+				.hasNext();) {

+			RefactoringUnit childElement = (RefactoringUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ParallelQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SequentialUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ConditionalUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == AtomicUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitHelperUnitsCompartment_7059SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7060SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getRefactoringUnits().iterator(); it

+				.hasNext();) {

+			RefactoringUnit childElement = (RefactoringUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ParallelQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SequentialUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ConditionalUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == AtomicUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitIfCompartment_7061SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			ConditionCheck childElement = modelElement.getIf();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == ConditionCheckEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitHelperUnitsCompartment_7062SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitThenCompartment_7063SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getThen();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitElseCompartment_7064SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getElse();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitIfCompartment_7065SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			ConditionCheck childElement = modelElement.getIf();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == ConditionCheckEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitHelperUnitsCompartment_7066SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitThenCompartment_7067SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getThen();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitElseCompartment_7068SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getElse();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitHelperUnitsCompartment_7069SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7070SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getRefactoringUnits().iterator(); it

+				.hasNext();) {

+			RefactoringUnit childElement = (RefactoringUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ParallelQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SequentialUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ConditionalUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == AtomicUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitIfCompartment_7071SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			ConditionCheck childElement = modelElement.getIf();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == ConditionCheckEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitHelperUnitsCompartment_7072SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitThenCompartment_7073SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getThen();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitElseCompartment_7074SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getElse();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment_7075SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit2EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment_7076SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ParallelQueuedUnit modelElement = (ParallelQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnits();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment_7077SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment_7078SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SingleQueuedUnit modelElement = (SingleQueuedUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getRefactoringUnit();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitHelperUnitsCompartment_7079SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getSequentialUnitSequentialUnitRefactoringUnitsCompartment_7080SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		SequentialUnit modelElement = (SequentialUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getRefactoringUnits().iterator(); it

+				.hasNext();) {

+			RefactoringUnit childElement = (RefactoringUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ParallelQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SequentialUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == ConditionalUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == AtomicUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitIfCompartment_7081SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			ConditionCheck childElement = modelElement.getIf();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == ConditionCheckEditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitHelperUnitsCompartment_7082SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		for (Iterator<?> it = modelElement.getHelperUnits().iterator(); it

+				.hasNext();) {

+			HelperUnit childElement = (HelperUnit) it.next();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == SingleFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFeatureUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == SingleFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if (visualID == MultiFilterUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitThenCompartment_7083SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getThen();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit3EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit4EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit5EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit6EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelNodeDescriptor> getConditionalUnitConditionalUnitElseCompartment_7084SemanticChildren(

+			View view) {

+		if (false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View) view.eContainer();

+		if (!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ConditionalUnit modelElement = (ConditionalUnit) containerView

+				.getElement();

+		LinkedList<ComrelNodeDescriptor> result = new LinkedList<ComrelNodeDescriptor>();

+		{

+			RefactoringUnit childElement = modelElement.getElse();

+			int visualID = ComrelVisualIDRegistry.getNodeVisualID(view,

+					childElement);

+			if (visualID == CartesianQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ParallelQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SingleQueuedUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == SequentialUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == ConditionalUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+			if (visualID == AtomicUnit7EditPart.VISUAL_ID) {

+				result.add(new ComrelNodeDescriptor(childElement, visualID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getContainedLinks(View view) {

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+		case CompositeRefactoringEditPart.VISUAL_ID:

+			return getCompositeRefactoring_1000ContainedLinks(view);

+		case SingleInputPortEditPart.VISUAL_ID:

+			return getSingleInputPort_2001ContainedLinks(view);

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_2002ContainedLinks(view);

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return getParallelQueuedUnit_2003ContainedLinks(view);

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return getSingleQueuedUnit_2004ContainedLinks(view);

+		case SequentialUnitEditPart.VISUAL_ID:

+			return getSequentialUnit_2005ContainedLinks(view);

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return getConditionalUnit_2006ContainedLinks(view);

+		case AtomicUnitEditPart.VISUAL_ID:

+			return getAtomicUnit_2007ContainedLinks(view);

+		case SingleInputPort2EditPart.VISUAL_ID:

+			return getSingleInputPort_3001ContainedLinks(view);

+		case MultiInputPortEditPart.VISUAL_ID:

+			return getMultiInputPort_3002ContainedLinks(view);

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3003ContainedLinks(view);

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3004ContainedLinks(view);

+		case SingleInputPort3EditPart.VISUAL_ID:

+			return getSingleInputPort_3005ContainedLinks(view);

+		case MultiInputPort2EditPart.VISUAL_ID:

+			return getMultiInputPort_3006ContainedLinks(view);

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3007ContainedLinks(view);

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3008ContainedLinks(view);

+		case SingleInputPort4EditPart.VISUAL_ID:

+			return getSingleInputPort_3009ContainedLinks(view);

+		case MultiInputPort3EditPart.VISUAL_ID:

+			return getMultiInputPort_3010ContainedLinks(view);

+		case SingleOutputPortEditPart.VISUAL_ID:

+			return getSingleOutputPort_3011ContainedLinks(view);

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3012ContainedLinks(view);

+		case SingleInputPort5EditPart.VISUAL_ID:

+			return getSingleInputPort_3013ContainedLinks(view);

+		case MultiInputPort4EditPart.VISUAL_ID:

+			return getMultiInputPort_3014ContainedLinks(view);

+		case MultiOutputPortEditPart.VISUAL_ID:

+			return getMultiOutputPort_3015ContainedLinks(view);

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return getSingleFilterUnit_3016ContainedLinks(view);

+		case MultiInputPort5EditPart.VISUAL_ID:

+			return getMultiInputPort_3017ContainedLinks(view);

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			return getSingleOutputPort_3018ContainedLinks(view);

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return getMultiFilterUnit_3019ContainedLinks(view);

+		case MultiInputPort6EditPart.VISUAL_ID:

+			return getMultiInputPort_3020ContainedLinks(view);

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			return getMultiOutputPort_3021ContainedLinks(view);

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3022ContainedLinks(view);

+		case SingleInputPort6EditPart.VISUAL_ID:

+			return getSingleInputPort_3023ContainedLinks(view);

+		case MultiInputPort7EditPart.VISUAL_ID:

+			return getMultiInputPort_3024ContainedLinks(view);

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3025ContainedLinks(view);

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return getSequentialUnit_3026ContainedLinks(view);

+		case SingleInputPort7EditPart.VISUAL_ID:

+			return getSingleInputPort_3027ContainedLinks(view);

+		case MultiInputPort8EditPart.VISUAL_ID:

+			return getMultiInputPort_3028ContainedLinks(view);

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3029ContainedLinks(view);

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return getConditionalUnit_3030ContainedLinks(view);

+		case SingleInputPort8EditPart.VISUAL_ID:

+			return getSingleInputPort_3031ContainedLinks(view);

+		case MultiInputPort9EditPart.VISUAL_ID:

+			return getMultiInputPort_3032ContainedLinks(view);

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3033ContainedLinks(view);

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return getAtomicUnit_3034ContainedLinks(view);

+		case SingleInputPort9EditPart.VISUAL_ID:

+			return getSingleInputPort_3035ContainedLinks(view);

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3036ContainedLinks(view);

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3037ContainedLinks(view);

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3038ContainedLinks(view);

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3039ContainedLinks(view);

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3040ContainedLinks(view);

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3041ContainedLinks(view);

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3042ContainedLinks(view);

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3043ContainedLinks(view);

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return getSequentialUnit_3044ContainedLinks(view);

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3045ContainedLinks(view);

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return getConditionalUnit_3046ContainedLinks(view);

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3047ContainedLinks(view);

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3048ContainedLinks(view);

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return getAtomicUnit_3049ContainedLinks(view);

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3050ContainedLinks(view);

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3051ContainedLinks(view);

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3052ContainedLinks(view);

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3053ContainedLinks(view);

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3054ContainedLinks(view);

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3055ContainedLinks(view);

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3056ContainedLinks(view);

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3057ContainedLinks(view);

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3058ContainedLinks(view);

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3059ContainedLinks(view);

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return getSequentialUnit_3060ContainedLinks(view);

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3061ContainedLinks(view);

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3062ContainedLinks(view);

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3063ContainedLinks(view);

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3064ContainedLinks(view);

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3065ContainedLinks(view);

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return getConditionalUnit_3066ContainedLinks(view);

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3067ContainedLinks(view);

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return getAtomicUnit_3068ContainedLinks(view);

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return getSequentialUnit_3069ContainedLinks(view);

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return getSequentialUnit_3070ContainedLinks(view);

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return getConditionalUnit_3071ContainedLinks(view);

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return getConditionalUnit_3072ContainedLinks(view);

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return getSequentialUnit_3073ContainedLinks(view);

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return getAtomicUnit_3074ContainedLinks(view);

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return getConditionalUnit_3075ContainedLinks(view);

+		case ConditionCheckEditPart.VISUAL_ID:

+			return getConditionCheck_3076ContainedLinks(view);

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return getAtomicUnit_3077ContainedLinks(view);

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return getAtomicUnit_3078ContainedLinks(view);

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getSinglePortMapping_4001ContainedLinks(view);

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getMultiPortMapping_4002ContainedLinks(view);

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getMultiSinglePortMapping_4003ContainedLinks(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getIncomingLinks(View view) {

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+		case SingleInputPortEditPart.VISUAL_ID:

+			return getSingleInputPort_2001IncomingLinks(view);

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_2002IncomingLinks(view);

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return getParallelQueuedUnit_2003IncomingLinks(view);

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return getSingleQueuedUnit_2004IncomingLinks(view);

+		case SequentialUnitEditPart.VISUAL_ID:

+			return getSequentialUnit_2005IncomingLinks(view);

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return getConditionalUnit_2006IncomingLinks(view);

+		case AtomicUnitEditPart.VISUAL_ID:

+			return getAtomicUnit_2007IncomingLinks(view);

+		case SingleInputPort2EditPart.VISUAL_ID:

+			return getSingleInputPort_3001IncomingLinks(view);

+		case MultiInputPortEditPart.VISUAL_ID:

+			return getMultiInputPort_3002IncomingLinks(view);

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3003IncomingLinks(view);

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3004IncomingLinks(view);

+		case SingleInputPort3EditPart.VISUAL_ID:

+			return getSingleInputPort_3005IncomingLinks(view);

+		case MultiInputPort2EditPart.VISUAL_ID:

+			return getMultiInputPort_3006IncomingLinks(view);

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3007IncomingLinks(view);

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3008IncomingLinks(view);

+		case SingleInputPort4EditPart.VISUAL_ID:

+			return getSingleInputPort_3009IncomingLinks(view);

+		case MultiInputPort3EditPart.VISUAL_ID:

+			return getMultiInputPort_3010IncomingLinks(view);

+		case SingleOutputPortEditPart.VISUAL_ID:

+			return getSingleOutputPort_3011IncomingLinks(view);

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3012IncomingLinks(view);

+		case SingleInputPort5EditPart.VISUAL_ID:

+			return getSingleInputPort_3013IncomingLinks(view);

+		case MultiInputPort4EditPart.VISUAL_ID:

+			return getMultiInputPort_3014IncomingLinks(view);

+		case MultiOutputPortEditPart.VISUAL_ID:

+			return getMultiOutputPort_3015IncomingLinks(view);

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return getSingleFilterUnit_3016IncomingLinks(view);

+		case MultiInputPort5EditPart.VISUAL_ID:

+			return getMultiInputPort_3017IncomingLinks(view);

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			return getSingleOutputPort_3018IncomingLinks(view);

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return getMultiFilterUnit_3019IncomingLinks(view);

+		case MultiInputPort6EditPart.VISUAL_ID:

+			return getMultiInputPort_3020IncomingLinks(view);

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			return getMultiOutputPort_3021IncomingLinks(view);

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3022IncomingLinks(view);

+		case SingleInputPort6EditPart.VISUAL_ID:

+			return getSingleInputPort_3023IncomingLinks(view);

+		case MultiInputPort7EditPart.VISUAL_ID:

+			return getMultiInputPort_3024IncomingLinks(view);

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3025IncomingLinks(view);

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return getSequentialUnit_3026IncomingLinks(view);

+		case SingleInputPort7EditPart.VISUAL_ID:

+			return getSingleInputPort_3027IncomingLinks(view);

+		case MultiInputPort8EditPart.VISUAL_ID:

+			return getMultiInputPort_3028IncomingLinks(view);

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3029IncomingLinks(view);

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return getConditionalUnit_3030IncomingLinks(view);

+		case SingleInputPort8EditPart.VISUAL_ID:

+			return getSingleInputPort_3031IncomingLinks(view);

+		case MultiInputPort9EditPart.VISUAL_ID:

+			return getMultiInputPort_3032IncomingLinks(view);

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3033IncomingLinks(view);

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return getAtomicUnit_3034IncomingLinks(view);

+		case SingleInputPort9EditPart.VISUAL_ID:

+			return getSingleInputPort_3035IncomingLinks(view);

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3036IncomingLinks(view);

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3037IncomingLinks(view);

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3038IncomingLinks(view);

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3039IncomingLinks(view);

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3040IncomingLinks(view);

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3041IncomingLinks(view);

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3042IncomingLinks(view);

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3043IncomingLinks(view);

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return getSequentialUnit_3044IncomingLinks(view);

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3045IncomingLinks(view);

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return getConditionalUnit_3046IncomingLinks(view);

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3047IncomingLinks(view);

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3048IncomingLinks(view);

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return getAtomicUnit_3049IncomingLinks(view);

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3050IncomingLinks(view);

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3051IncomingLinks(view);

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3052IncomingLinks(view);

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3053IncomingLinks(view);

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3054IncomingLinks(view);

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3055IncomingLinks(view);

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3056IncomingLinks(view);

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3057IncomingLinks(view);

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3058IncomingLinks(view);

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3059IncomingLinks(view);

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return getSequentialUnit_3060IncomingLinks(view);

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3061IncomingLinks(view);

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3062IncomingLinks(view);

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3063IncomingLinks(view);

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3064IncomingLinks(view);

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3065IncomingLinks(view);

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return getConditionalUnit_3066IncomingLinks(view);

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3067IncomingLinks(view);

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return getAtomicUnit_3068IncomingLinks(view);

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return getSequentialUnit_3069IncomingLinks(view);

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return getSequentialUnit_3070IncomingLinks(view);

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return getConditionalUnit_3071IncomingLinks(view);

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return getConditionalUnit_3072IncomingLinks(view);

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return getSequentialUnit_3073IncomingLinks(view);

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return getAtomicUnit_3074IncomingLinks(view);

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return getConditionalUnit_3075IncomingLinks(view);

+		case ConditionCheckEditPart.VISUAL_ID:

+			return getConditionCheck_3076IncomingLinks(view);

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return getAtomicUnit_3077IncomingLinks(view);

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return getAtomicUnit_3078IncomingLinks(view);

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getSinglePortMapping_4001IncomingLinks(view);

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getMultiPortMapping_4002IncomingLinks(view);

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getMultiSinglePortMapping_4003IncomingLinks(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getOutgoingLinks(View view) {

+		switch (ComrelVisualIDRegistry.getVisualID(view)) {

+		case SingleInputPortEditPart.VISUAL_ID:

+			return getSingleInputPort_2001OutgoingLinks(view);

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_2002OutgoingLinks(view);

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return getParallelQueuedUnit_2003OutgoingLinks(view);

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return getSingleQueuedUnit_2004OutgoingLinks(view);

+		case SequentialUnitEditPart.VISUAL_ID:

+			return getSequentialUnit_2005OutgoingLinks(view);

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return getConditionalUnit_2006OutgoingLinks(view);

+		case AtomicUnitEditPart.VISUAL_ID:

+			return getAtomicUnit_2007OutgoingLinks(view);

+		case SingleInputPort2EditPart.VISUAL_ID:

+			return getSingleInputPort_3001OutgoingLinks(view);

+		case MultiInputPortEditPart.VISUAL_ID:

+			return getMultiInputPort_3002OutgoingLinks(view);

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3003OutgoingLinks(view);

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3004OutgoingLinks(view);

+		case SingleInputPort3EditPart.VISUAL_ID:

+			return getSingleInputPort_3005OutgoingLinks(view);

+		case MultiInputPort2EditPart.VISUAL_ID:

+			return getMultiInputPort_3006OutgoingLinks(view);

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3007OutgoingLinks(view);

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3008OutgoingLinks(view);

+		case SingleInputPort4EditPart.VISUAL_ID:

+			return getSingleInputPort_3009OutgoingLinks(view);

+		case MultiInputPort3EditPart.VISUAL_ID:

+			return getMultiInputPort_3010OutgoingLinks(view);

+		case SingleOutputPortEditPart.VISUAL_ID:

+			return getSingleOutputPort_3011OutgoingLinks(view);

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3012OutgoingLinks(view);

+		case SingleInputPort5EditPart.VISUAL_ID:

+			return getSingleInputPort_3013OutgoingLinks(view);

+		case MultiInputPort4EditPart.VISUAL_ID:

+			return getMultiInputPort_3014OutgoingLinks(view);

+		case MultiOutputPortEditPart.VISUAL_ID:

+			return getMultiOutputPort_3015OutgoingLinks(view);

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return getSingleFilterUnit_3016OutgoingLinks(view);

+		case MultiInputPort5EditPart.VISUAL_ID:

+			return getMultiInputPort_3017OutgoingLinks(view);

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			return getSingleOutputPort_3018OutgoingLinks(view);

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return getMultiFilterUnit_3019OutgoingLinks(view);

+		case MultiInputPort6EditPart.VISUAL_ID:

+			return getMultiInputPort_3020OutgoingLinks(view);

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			return getMultiOutputPort_3021OutgoingLinks(view);

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3022OutgoingLinks(view);

+		case SingleInputPort6EditPart.VISUAL_ID:

+			return getSingleInputPort_3023OutgoingLinks(view);

+		case MultiInputPort7EditPart.VISUAL_ID:

+			return getMultiInputPort_3024OutgoingLinks(view);

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3025OutgoingLinks(view);

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return getSequentialUnit_3026OutgoingLinks(view);

+		case SingleInputPort7EditPart.VISUAL_ID:

+			return getSingleInputPort_3027OutgoingLinks(view);

+		case MultiInputPort8EditPart.VISUAL_ID:

+			return getMultiInputPort_3028OutgoingLinks(view);

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3029OutgoingLinks(view);

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return getConditionalUnit_3030OutgoingLinks(view);

+		case SingleInputPort8EditPart.VISUAL_ID:

+			return getSingleInputPort_3031OutgoingLinks(view);

+		case MultiInputPort9EditPart.VISUAL_ID:

+			return getMultiInputPort_3032OutgoingLinks(view);

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3033OutgoingLinks(view);

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return getAtomicUnit_3034OutgoingLinks(view);

+		case SingleInputPort9EditPart.VISUAL_ID:

+			return getSingleInputPort_3035OutgoingLinks(view);

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3036OutgoingLinks(view);

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3037OutgoingLinks(view);

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3038OutgoingLinks(view);

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3039OutgoingLinks(view);

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3040OutgoingLinks(view);

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3041OutgoingLinks(view);

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3042OutgoingLinks(view);

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3043OutgoingLinks(view);

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return getSequentialUnit_3044OutgoingLinks(view);

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3045OutgoingLinks(view);

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return getConditionalUnit_3046OutgoingLinks(view);

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnit_3047OutgoingLinks(view);

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return getParallelQueuedUnit_3048OutgoingLinks(view);

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return getAtomicUnit_3049OutgoingLinks(view);

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3050OutgoingLinks(view);

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3051OutgoingLinks(view);

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3052OutgoingLinks(view);

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3053OutgoingLinks(view);

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3054OutgoingLinks(view);

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3055OutgoingLinks(view);

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3056OutgoingLinks(view);

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3057OutgoingLinks(view);

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3058OutgoingLinks(view);

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3059OutgoingLinks(view);

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return getSequentialUnit_3060OutgoingLinks(view);

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return getSingleFeatureUnit_3061OutgoingLinks(view);

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return getMultiFeatureUnit_3062OutgoingLinks(view);

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return getSingleFilterUnit_3063OutgoingLinks(view);

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return getMultiFilterUnit_3064OutgoingLinks(view);

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3065OutgoingLinks(view);

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return getConditionalUnit_3066OutgoingLinks(view);

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return getSingleQueuedUnit_3067OutgoingLinks(view);

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return getAtomicUnit_3068OutgoingLinks(view);

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return getSequentialUnit_3069OutgoingLinks(view);

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return getSequentialUnit_3070OutgoingLinks(view);

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return getConditionalUnit_3071OutgoingLinks(view);

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return getConditionalUnit_3072OutgoingLinks(view);

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return getSequentialUnit_3073OutgoingLinks(view);

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return getAtomicUnit_3074OutgoingLinks(view);

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return getConditionalUnit_3075OutgoingLinks(view);

+		case ConditionCheckEditPart.VISUAL_ID:

+			return getConditionCheck_3076OutgoingLinks(view);

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return getAtomicUnit_3077OutgoingLinks(view);

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return getAtomicUnit_3078OutgoingLinks(view);

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return getSinglePortMapping_4001OutgoingLinks(view);

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return getMultiPortMapping_4002OutgoingLinks(view);

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return getMultiSinglePortMapping_4003OutgoingLinks(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCompositeRefactoring_1000ContainedLinks(

+			View view) {

+		CompositeRefactoring modelElement = (CompositeRefactoring) view

+				.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_2001ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_2002ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_2003ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_2004ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_2005ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_2006ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_2007ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3001ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3002ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3003ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3004ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3005ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3006ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3007ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3008ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3009ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3010ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleOutputPort_3011ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3012ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3013ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3014ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiOutputPort_3015ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3016ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3017ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleOutputPort_3018ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3019ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3020ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiOutputPort_3021ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3022ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3023ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3024ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3025ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3026ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3027ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3028ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3029ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3030ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3031ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3032ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3033ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3034ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3035ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3036ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3037ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3038ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3039ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3040ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3041ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3042ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3043ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3044ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3045ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3046ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3047ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3048ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3049ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3050ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3051ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3052ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3053ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3054ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3055ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3056ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3057ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3058ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3059ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3060ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3061ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3062ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3063ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3064ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3065ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3066ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3067ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3068ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3069ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3070ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3071ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3072ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3073ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3074ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3075ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionCheck_3076ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3077ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3078ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSinglePortMapping_4001ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiPortMapping_4002ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiSinglePortMapping_4003ContainedLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_2001IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_2002IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_2003IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_2004IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_2005IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_2006IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_2007IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3001IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3002IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3003IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3004IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3005IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3006IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3007IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3008IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3009IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3010IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleOutputPort_3011IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3012IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3013IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3014IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiOutputPort_3015IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3016IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3017IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleOutputPort_3018IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3019IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3020IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiOutputPort_3021IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3022IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3023IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3024IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3025IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3026IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3027IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3028IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3029IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3030IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3031IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3032IncomingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3033IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3034IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3035IncomingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer

+				.find(view.eResource().getResourceSet().getResources());

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+				modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+				modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3036IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3037IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3038IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3039IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3040IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3041IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3042IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3043IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3044IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3045IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3046IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3047IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3048IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3049IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3050IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3051IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3052IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3053IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3054IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3055IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3056IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3057IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3058IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3059IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3060IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3061IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3062IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3063IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3064IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3065IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3066IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3067IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3068IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3069IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3070IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3071IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3072IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3073IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3074IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3075IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionCheck_3076IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3077IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3078IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSinglePortMapping_4001IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiPortMapping_4002IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiSinglePortMapping_4003IncomingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_2001OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_2002OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_2003OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_2004OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_2005OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_2006OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_2007OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3001OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3002OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3003OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3004OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3005OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3006OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3007OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3008OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3009OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3010OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleOutputPort_3011OutgoingLinks(

+			View view) {

+		SingleOutputPort modelElement = (SingleOutputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3012OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3013OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3014OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiOutputPort_3015OutgoingLinks(

+			View view) {

+		MultiOutputPort modelElement = (MultiOutputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3016OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3017OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleOutputPort_3018OutgoingLinks(

+			View view) {

+		SingleOutputPort modelElement = (SingleOutputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3019OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3020OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiOutputPort_3021OutgoingLinks(

+			View view) {

+		MultiOutputPort modelElement = (MultiOutputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3022OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3023OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3024OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3025OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3026OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3027OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3028OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3029OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3030OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3031OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiInputPort_3032OutgoingLinks(

+			View view) {

+		MultiInputPort modelElement = (MultiInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3033OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3034OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleInputPort_3035OutgoingLinks(

+			View view) {

+		SingleInputPort modelElement = (SingleInputPort) view.getElement();

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3036OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3037OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3038OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3039OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3040OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3041OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3042OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3043OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3044OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3045OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3046OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getCartesianQueuedUnit_3047OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getParallelQueuedUnit_3048OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3049OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3050OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3051OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3052OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3053OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3054OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3055OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3056OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3057OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3058OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3059OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3060OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFeatureUnit_3061OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFeatureUnit_3062OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleFilterUnit_3063OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiFilterUnit_3064OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3065OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3066OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSingleQueuedUnit_3067OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3068OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3069OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3070OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3071OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3072OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSequentialUnit_3073OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3074OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionalUnit_3075OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getConditionCheck_3076OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3077OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getAtomicUnit_3078OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getSinglePortMapping_4001OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiPortMapping_4002OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public static List<ComrelLinkDescriptor> getMultiSinglePortMapping_4003OutgoingLinks(

+			View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getContainedTypeModelFacetLinks_SinglePortMapping_4001(

+			CompositeRefactoring container) {

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		for (Iterator<?> links = container.getPortMappings().iterator(); links

+				.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof SinglePortMapping) {

+				continue;

+			}

+			SinglePortMapping link = (SinglePortMapping) linkObject;

+			if (SinglePortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			SingleInputPort dst = link.getTarget();

+			SinglePort src = link.getSource();

+			result.add(new ComrelLinkDescriptor(src, dst, link,

+					ComrelElementTypes.SinglePortMapping_4001,

+					SinglePortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getContainedTypeModelFacetLinks_MultiPortMapping_4002(

+			CompositeRefactoring container) {

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		for (Iterator<?> links = container.getPortMappings().iterator(); links

+				.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof MultiPortMapping) {

+				continue;

+			}

+			MultiPortMapping link = (MultiPortMapping) linkObject;

+			if (MultiPortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			MultiInputPort dst = link.getTarget();

+			MultiPort src = link.getSource();

+			result.add(new ComrelLinkDescriptor(src, dst, link,

+					ComrelElementTypes.MultiPortMapping_4002,

+					MultiPortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getContainedTypeModelFacetLinks_MultiSinglePortMapping_4003(

+			CompositeRefactoring container) {

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		for (Iterator<?> links = container.getPortMappings().iterator(); links

+				.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof MultiSinglePortMapping) {

+				continue;

+			}

+			MultiSinglePortMapping link = (MultiSinglePortMapping) linkObject;

+			if (MultiSinglePortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			SingleInputPort dst = link.getTarget();

+			MultiPort src = link.getSource();

+			result.add(new ComrelLinkDescriptor(src, dst, link,

+					ComrelElementTypes.MultiSinglePortMapping_4003,

+					MultiSinglePortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getIncomingTypeModelFacetLinks_SinglePortMapping_4001(

+			SingleInputPort target,

+			Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences

+				.get(target);

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != ComrelPackage.eINSTANCE

+					.getSinglePortMapping_Target()

+					|| false == setting.getEObject() instanceof SinglePortMapping) {

+				continue;

+			}

+			SinglePortMapping link = (SinglePortMapping) setting.getEObject();

+			if (SinglePortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			SinglePort src = link.getSource();

+			result.add(new ComrelLinkDescriptor(src, target, link,

+					ComrelElementTypes.SinglePortMapping_4001,

+					SinglePortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getIncomingTypeModelFacetLinks_MultiPortMapping_4002(

+			MultiInputPort target,

+			Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences

+				.get(target);

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != ComrelPackage.eINSTANCE

+					.getMultiPortMapping_Target()

+					|| false == setting.getEObject() instanceof MultiPortMapping) {

+				continue;

+			}

+			MultiPortMapping link = (MultiPortMapping) setting.getEObject();

+			if (MultiPortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			MultiPort src = link.getSource();

+			result.add(new ComrelLinkDescriptor(src, target, link,

+					ComrelElementTypes.MultiPortMapping_4002,

+					MultiPortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getIncomingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+			SingleInputPort target,

+			Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences

+				.get(target);

+		for (EStructuralFeature.Setting setting : settings) {

+			if (setting.getEStructuralFeature() != ComrelPackage.eINSTANCE

+					.getMultiSinglePortMapping_Target()

+					|| false == setting.getEObject() instanceof MultiSinglePortMapping) {

+				continue;

+			}

+			MultiSinglePortMapping link = (MultiSinglePortMapping) setting

+					.getEObject();

+			if (MultiSinglePortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			MultiPort src = link.getSource();

+			result.add(new ComrelLinkDescriptor(src, target, link,

+					ComrelElementTypes.MultiSinglePortMapping_4003,

+					MultiSinglePortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getOutgoingTypeModelFacetLinks_SinglePortMapping_4001(

+			SinglePort source) {

+		CompositeRefactoring container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element

+				.eContainer()) {

+			if (element instanceof CompositeRefactoring) {

+				container = (CompositeRefactoring) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		for (Iterator<?> links = container.getPortMappings().iterator(); links

+				.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof SinglePortMapping) {

+				continue;

+			}

+			SinglePortMapping link = (SinglePortMapping) linkObject;

+			if (SinglePortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			SingleInputPort dst = link.getTarget();

+			SinglePort src = link.getSource();

+			if (src != source) {

+				continue;

+			}

+			result.add(new ComrelLinkDescriptor(src, dst, link,

+					ComrelElementTypes.SinglePortMapping_4001,

+					SinglePortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getOutgoingTypeModelFacetLinks_MultiPortMapping_4002(

+			MultiPort source) {

+		CompositeRefactoring container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element

+				.eContainer()) {

+			if (element instanceof CompositeRefactoring) {

+				container = (CompositeRefactoring) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		for (Iterator<?> links = container.getPortMappings().iterator(); links

+				.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof MultiPortMapping) {

+				continue;

+			}

+			MultiPortMapping link = (MultiPortMapping) linkObject;

+			if (MultiPortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			MultiInputPort dst = link.getTarget();

+			MultiPort src = link.getSource();

+			if (src != source) {

+				continue;

+			}

+			result.add(new ComrelLinkDescriptor(src, dst, link,

+					ComrelElementTypes.MultiPortMapping_4002,

+					MultiPortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<ComrelLinkDescriptor> getOutgoingTypeModelFacetLinks_MultiSinglePortMapping_4003(

+			MultiPort source) {

+		CompositeRefactoring container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for (EObject element = source; element != null && container == null; element = element

+				.eContainer()) {

+			if (element instanceof CompositeRefactoring) {

+				container = (CompositeRefactoring) element;

+			}

+		}

+		if (container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<ComrelLinkDescriptor> result = new LinkedList<ComrelLinkDescriptor>();

+		for (Iterator<?> links = container.getPortMappings().iterator(); links

+				.hasNext();) {

+			EObject linkObject = (EObject) links.next();

+			if (false == linkObject instanceof MultiSinglePortMapping) {

+				continue;

+			}

+			MultiSinglePortMapping link = (MultiSinglePortMapping) linkObject;

+			if (MultiSinglePortMappingEditPart.VISUAL_ID != ComrelVisualIDRegistry

+					.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			SingleInputPort dst = link.getTarget();

+			MultiPort src = link.getSource();

+			if (src != source) {

+				continue;

+			}

+			result.add(new ComrelLinkDescriptor(src, dst, link,

+					ComrelElementTypes.MultiSinglePortMapping_4003,

+					MultiSinglePortMappingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDocumentProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDocumentProvider.java
new file mode 100644
index 0000000..20739d2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelDocumentProvider.java
@@ -0,0 +1,1132 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.io.IOException;

+import java.util.ArrayList;

+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.commands.ExecutionException;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.IResourceStatus;

+import org.eclipse.core.resources.IStorage;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

+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.core.runtime.jobs.ISchedulingRule;

+import org.eclipse.core.runtime.jobs.MultiRule;

+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.common.ui.URIEditorInput;

+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.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.transaction.NotificationFilter;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;

+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.IDocument;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;

+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.View;

+import org.eclipse.jface.operation.IRunnableContext;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.part.FileEditorInput;

+

+/**

+ * @generated

+ */

+public class ComrelDocumentProvider extends AbstractDocumentProvider implements

+		IDiagramDocumentProvider {

+

+	/**

+	 * @generated

+	 */

+	protected ElementInfo createElementInfo(Object element)

+			throws CoreException {

+		if (false == element instanceof FileEditorInput

+				&& false == element instanceof URIEditorInput) {

+			throw new CoreException(

+					new Status(

+							IStatus.ERROR,

+							ComrelDiagramEditorPlugin.ID,

+							0,

+							NLS.bind(

+									Messages.ComrelDocumentProvider_IncorrectInputError,

+									new Object[] {

+											element,

+											"org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+							null));

+		}

+		IEditorInput editorInput = (IEditorInput) element;

+		IDiagramDocument document = (IDiagramDocument) createDocument(editorInput);

+

+		ResourceSetInfo info = new ResourceSetInfo(document, editorInput);

+		info.setModificationStamp(computeModificationStamp(info));

+		info.fStatus = null;

+		return info;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IDocument createDocument(Object element) throws CoreException {

+		if (false == element instanceof FileEditorInput

+				&& false == element instanceof URIEditorInput) {

+			throw new CoreException(

+					new Status(

+							IStatus.ERROR,

+							ComrelDiagramEditorPlugin.ID,

+							0,

+							NLS.bind(

+									Messages.ComrelDocumentProvider_IncorrectInputError,

+									new Object[] {

+											element,

+											"org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+							null));

+		}

+		IDocument document = createEmptyDocument();

+		setDocumentContent(document, (IEditorInput) element);

+		setupDocument(element, document);

+		return document;

+	}

+

+	/**

+	 * Sets up the given document as it would be provided for the given element. The

+	 * content of the document is not changed. This default implementation is empty.

+	 * Subclasses may reimplement.

+	 * 

+	 * @param element the blue-print element

+	 * @param document the document to set up

+	 * @generated

+	 */

+	protected void setupDocument(Object element, IDocument document) {

+		// for subclasses

+	}

+

+	/**

+	 * @generated

+	 */

+	private long computeModificationStamp(ResourceSetInfo info) {

+		int result = 0;

+		for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+				.hasNext();) {

+			Resource nextResource = it.next();

+			IFile file = WorkspaceSynchronizer.getFile(nextResource);

+			if (file != null) {

+				if (file.getLocation() != null) {

+					result += file.getLocation().toFile().lastModified();

+				} else {

+					result += file.getModificationStamp();

+				}

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IDocument createEmptyDocument() {

+		DiagramDocument document = new DiagramDocument();

+		document.setEditingDomain(createEditingDomain());

+		return document;

+	}

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain createEditingDomain() {

+		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory

+				.getInstance().createEditingDomain();

+		editingDomain.setID("comrel.diagram.EditingDomain"); //$NON-NLS-1$

+		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter

+				.createNotifierFilter(editingDomain.getResourceSet())

+				.and(NotificationFilter.createEventTypeFilter(Notification.ADD))

+				.and(NotificationFilter.createFeatureFilter(ResourceSet.class,

+						ResourceSet.RESOURCE_SET__RESOURCES));

+		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

+

+			private Notifier myTarger;

+

+			public Notifier getTarget() {

+				return myTarger;

+			}

+

+			public boolean isAdapterForType(Object type) {

+				return false;

+			}

+

+			public void notifyChanged(Notification notification) {

+				if (diagramResourceModifiedFilter.matches(notification)) {

+					Object value = notification.getNewValue();

+					if (value instanceof Resource) {

+						((Resource) value).setTrackingModification(true);

+					}

+				}

+			}

+

+			public void setTarget(Notifier newTarget) {

+				myTarger = newTarget;

+			}

+

+		});

+

+		return editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setDocumentContent(IDocument document, IEditorInput element)

+			throws CoreException {

+		IDiagramDocument diagramDocument = (IDiagramDocument) document;

+		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();

+		if (element instanceof FileEditorInput) {

+			IStorage storage = ((FileEditorInput) element).getStorage();

+			Diagram diagram = DiagramIOUtil.load(domain, storage, true,

+					getProgressMonitor());

+			document.setContent(diagram);

+		} else if (element instanceof URIEditorInput) {

+			URI uri = ((URIEditorInput) element).getURI();

+			Resource resource = null;

+			try {

+				resource = domain.getResourceSet().getResource(

+						uri.trimFragment(), false);

+				if (resource == null) {

+					resource = domain.getResourceSet().createResource(

+							uri.trimFragment());

+				}

+				if (!resource.isLoaded()) {

+					try {

+						Map options = new HashMap(

+								GMFResourceFactory.getDefaultLoadOptions());

+						// @see 171060 

+						// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);

+						resource.load(options);

+					} catch (IOException e) {

+						resource.unload();

+						throw e;

+					}

+				}

+				if (uri.fragment() != null) {

+					EObject rootElement = resource.getEObject(uri.fragment());

+					if (rootElement instanceof Diagram) {

+						document.setContent((Diagram) rootElement);

+						return;

+					}

+				} else {

+					for (Iterator it = resource.getContents().iterator(); it

+							.hasNext();) {

+						Object rootElement = it.next();

+						if (rootElement instanceof Diagram) {

+							document.setContent((Diagram) rootElement);

+							return;

+						}

+					}

+				}

+				throw new RuntimeException(

+						Messages.ComrelDocumentProvider_NoDiagramInResourceError);

+			} catch (Exception e) {

+				CoreException thrownExcp = null;

+				if (e instanceof CoreException) {

+					thrownExcp = (CoreException) e;

+				} else {

+					String msg = e.getLocalizedMessage();

+					thrownExcp = new CoreException(

+							new Status(

+									IStatus.ERROR,

+									ComrelDiagramEditorPlugin.ID,

+									0,

+									msg != null ? msg

+											: Messages.ComrelDocumentProvider_DiagramLoadingError,

+									e));

+				}

+				throw thrownExcp;

+			}

+		} else {

+			throw new CoreException(

+					new Status(

+							IStatus.ERROR,

+							ComrelDiagramEditorPlugin.ID,

+							0,

+							NLS.bind(

+									Messages.ComrelDocumentProvider_IncorrectInputError,

+									new Object[] {

+											element,

+											"org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+							null));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public long getModificationStamp(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			return computeModificationStamp(info);

+		}

+		return super.getModificationStamp(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isDeleted(Object element) {

+		IDiagramDocument document = getDiagramDocument(element);

+		if (document != null) {

+			Resource diagramResource = document.getDiagram().eResource();

+			if (diagramResource != null) {

+				IFile file = WorkspaceSynchronizer.getFile(diagramResource);

+				return file == null || file.getLocation() == null

+						|| !file.getLocation().toFile().exists();

+			}

+		}

+		return super.isDeleted(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public ResourceSetInfo getResourceSetInfo(Object editorInput) {

+		return (ResourceSetInfo) super.getElementInfo(editorInput);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void disposeElementInfo(Object element, ElementInfo info) {

+		if (info instanceof ResourceSetInfo) {

+			ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info;

+			resourceSetInfo.dispose();

+		}

+		super.disposeElementInfo(element, info);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doValidateState(Object element, Object computationContext)

+			throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<IFile> files2Validate = new LinkedList<IFile>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null && file.isReadOnly()) {

+					files2Validate.add(file);

+				}

+			}

+			ResourcesPlugin.getWorkspace().validateEdit(

+					(IFile[]) files2Validate.toArray(new IFile[files2Validate

+							.size()]), computationContext);

+		}

+

+		super.doValidateState(element, computationContext);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isReadOnly(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			if (info.isUpdateCache()) {

+				try {

+					updateCache(element);

+				} catch (CoreException ex) {

+					ComrelDiagramEditorPlugin.getInstance().logError(

+							Messages.ComrelDocumentProvider_isModifiable, ex);

+					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable

+				}

+			}

+			return info.isReadOnly();

+		}

+		return super.isReadOnly(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isModifiable(Object element) {

+		if (!isStateValidated(element)) {

+			if (element instanceof FileEditorInput

+					|| element instanceof URIEditorInput) {

+				return true;

+			}

+		}

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			if (info.isUpdateCache()) {

+				try {

+					updateCache(element);

+				} catch (CoreException ex) {

+					ComrelDiagramEditorPlugin.getInstance().logError(

+							Messages.ComrelDocumentProvider_isModifiable, ex);

+					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable

+				}

+			}

+			return info.isModifiable();

+		}

+		return super.isModifiable(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateCache(Object element) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null && file.isReadOnly()) {

+					info.setReadOnly(true);

+					info.setModifiable(false);

+					return;

+				}

+			}

+			info.setReadOnly(false);

+			info.setModifiable(true);

+			return;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doUpdateStateCache(Object element) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			info.setUpdateCache(true);

+		}

+		super.doUpdateStateCache(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isSynchronized(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			return info.isSynchronized();

+		}

+		return super.isSynchronized(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getResetRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory()

+							.modifyRule(file));

+				}

+			}

+			return new MultiRule(

+					(ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules

+							.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getSaveRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					rules.add(computeSchedulingRule(file));

+				}

+			}

+			return new MultiRule(

+					(ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules

+							.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getSynchronizeRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory()

+							.refreshRule(file));

+				}

+			}

+			return new MultiRule(

+					(ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules

+							.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getValidateStateRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>();

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if (file != null) {

+					files.add(file);

+				}

+			}

+			return ResourcesPlugin

+					.getWorkspace()

+					.getRuleFactory()

+					.validateEditRule(

+							(IFile[]) files.toArray(new IFile[files.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {

+		if (toCreateOrModify.exists())

+			return ResourcesPlugin.getWorkspace().getRuleFactory()

+					.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());

+

+		return ResourcesPlugin.getWorkspace().getRuleFactory()

+				.createRule(toCreateOrModify);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doSynchronize(Object element, IProgressMonitor monitor)

+			throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource nextResource = it.next();

+				handleElementChanged(info, nextResource, monitor);

+			}

+			return;

+		}

+		super.doSynchronize(element, monitor);

+	}

+

+	/**

+	 * @generated NOT

+	 */

+	protected void doSaveDocument(IProgressMonitor monitor, Object element,

+			IDocument document, boolean overwrite) throws CoreException {

+		ValidateAction.runValidation((View) document.getContent());

+

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if (info != null) {

+			if (!overwrite && !info.isSynchronized()) {

+				throw new CoreException(

+						new Status(

+								IStatus.ERROR,

+								ComrelDiagramEditorPlugin.ID,

+								IResourceStatus.OUT_OF_SYNC_LOCAL,

+								Messages.ComrelDocumentProvider_UnsynchronizedFileSaveError,

+								null));

+			}

+			info.stopResourceListening();

+			fireElementStateChanging(element);

+			try {

+				monitor.beginTask(

+						Messages.ComrelDocumentProvider_SaveDiagramTask, info

+								.getResourceSet().getResources().size() + 1); //"Saving diagram"

+				for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it

+						.hasNext();) {

+					Resource nextResource = it.next();

+					monitor.setTaskName(NLS

+							.bind(Messages.ComrelDocumentProvider_SaveNextResourceTask,

+									nextResource.getURI()));

+					if (nextResource.isLoaded()

+							&& !info.getEditingDomain()

+									.isReadOnly(nextResource)) {

+						try {

+							nextResource.save(ComrelDiagramEditorUtil

+									.getSaveOptions());

+						} catch (IOException e) {

+							fireElementStateChangeFailed(element);

+							throw new CoreException(new Status(IStatus.ERROR,

+									ComrelDiagramEditorPlugin.ID,

+									EditorStatusCodes.RESOURCE_FAILURE,

+									e.getLocalizedMessage(), null));

+						}

+					}

+					monitor.worked(1);

+				}

+				monitor.done();

+				info.setModificationStamp(computeModificationStamp(info));

+			} catch (RuntimeException x) {

+				fireElementStateChangeFailed(element);

+				throw x;

+			} finally {

+				info.startResourceListening();

+			}

+		} else {

+			URI newResoruceURI;

+			List<IFile> affectedFiles = null;

+			if (element instanceof FileEditorInput) {

+				IFile newFile = ((FileEditorInput) element).getFile();

+				affectedFiles = Collections.singletonList(newFile);

+				newResoruceURI = URI.createPlatformResourceURI(newFile

+						.getFullPath().toString(), true);

+			} else if (element instanceof URIEditorInput) {

+				newResoruceURI = ((URIEditorInput) element).getURI();

+			} else {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(

+						new Status(

+								IStatus.ERROR,

+								ComrelDiagramEditorPlugin.ID,

+								0,

+								NLS.bind(

+										Messages.ComrelDocumentProvider_IncorrectInputError,

+										new Object[] {

+												element,

+												"org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+								null));

+			}

+			if (false == document instanceof IDiagramDocument) {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(

+						new Status(

+								IStatus.ERROR,

+								ComrelDiagramEditorPlugin.ID,

+								0,

+								"Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$

+			}

+			IDiagramDocument diagramDocument = (IDiagramDocument) document;

+			final Resource newResource = diagramDocument.getEditingDomain()

+					.getResourceSet().createResource(newResoruceURI);

+			final Diagram diagramCopy = (Diagram) EcoreUtil

+					.copy(diagramDocument.getDiagram());

+			try {

+				new AbstractTransactionalCommand(

+						diagramDocument.getEditingDomain(),

+						NLS.bind(

+								Messages.ComrelDocumentProvider_SaveAsOperation,

+								diagramCopy.getName()), affectedFiles) {

+					protected CommandResult doExecuteWithResult(

+							IProgressMonitor monitor, IAdaptable info)

+							throws ExecutionException {

+						newResource.getContents().add(diagramCopy);

+						return CommandResult.newOKCommandResult();

+					}

+				}.execute(monitor, null);

+				newResource.save(ComrelDiagramEditorUtil.getSaveOptions());

+			} catch (ExecutionException e) {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(new Status(IStatus.ERROR,

+						ComrelDiagramEditorPlugin.ID, 0,

+						e.getLocalizedMessage(), null));

+			} catch (IOException e) {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(new Status(IStatus.ERROR,

+						ComrelDiagramEditorPlugin.ID, 0,

+						e.getLocalizedMessage(), null));

+			}

+			newResource.unload();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleElementChanged(ResourceSetInfo info,

+			Resource changedResource, IProgressMonitor monitor) {

+		IFile file = WorkspaceSynchronizer.getFile(changedResource);

+		if (file != null) {

+			try {

+				file.refreshLocal(IResource.DEPTH_INFINITE, monitor);

+			} catch (CoreException ex) {

+				ComrelDiagramEditorPlugin

+						.getInstance()

+						.logError(

+								Messages.ComrelDocumentProvider_handleElementContentChanged,

+								ex);

+				// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged

+			}

+		}

+		changedResource.unload();

+

+		fireElementContentAboutToBeReplaced(info.getEditorInput());

+		removeUnchangedElementListeners(info.getEditorInput(), info);

+		info.fStatus = null;

+		try {

+			setDocumentContent(info.fDocument, info.getEditorInput());

+		} catch (CoreException e) {

+			info.fStatus = e.getStatus();

+		}

+		if (!info.fCanBeSaved) {

+			info.setModificationStamp(computeModificationStamp(info));

+		}

+		addUnchangedElementListeners(info.getEditorInput(), info);

+		fireElementContentReplaced(info.getEditorInput());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleElementMoved(IEditorInput input, URI uri) {

+		if (input instanceof FileEditorInput) {

+			IFile newFile = ResourcesPlugin

+					.getWorkspace()

+					.getRoot()

+					.getFile(

+							new Path(URI.decode(uri.path()))

+									.removeFirstSegments(1));

+			fireElementMoved(input, newFile == null ? null

+					: new FileEditorInput(newFile));

+			return;

+		}

+		// TODO: append suffix to the URI! (use diagram as a parameter)

+		fireElementMoved(input, new URIEditorInput(uri));

+	}

+

+	/**

+	 * @generated

+	 */

+	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput,

+			TransactionalEditingDomain domain) {

+		return editorInput;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IDiagramDocument getDiagramDocument(Object element) {

+		IDocument doc = getDocument(element);

+		if (doc instanceof IDiagramDocument) {

+			return (IDiagramDocument) doc;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected class ResourceSetInfo extends ElementInfo {

+

+		/**

+		 * @generated

+		 */

+		private long myModificationStamp = IResource.NULL_STAMP;

+

+		/**

+		 * @generated

+		 */

+		private WorkspaceSynchronizer mySynchronizer;

+

+		/**

+		 * @generated

+		 */

+		private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<Resource>();

+

+		/**

+		 * @generated

+		 */

+		private IDiagramDocument myDocument;

+

+		/**

+		 * @generated

+		 */

+		private IEditorInput myEditorInput;

+

+		/**

+		 * @generated

+		 */

+		private boolean myUpdateCache = true;

+

+		/**

+		 * @generated

+		 */

+		private boolean myModifiable = false;

+

+		/**

+		 * @generated

+		 */

+		private boolean myReadOnly = true;

+

+		/**

+		 * @generated

+		 */

+		private ResourceSetModificationListener myResourceSetListener;

+

+		/**

+		 * @generated

+		 */

+		public ResourceSetInfo(IDiagramDocument document,

+				IEditorInput editorInput) {

+			super(document);

+			myDocument = document;

+			myEditorInput = editorInput;

+			startResourceListening();

+			myResourceSetListener = new ResourceSetModificationListener(this);

+			getResourceSet().eAdapters().add(myResourceSetListener);

+		}

+

+		/**

+		 * @generated

+		 */

+		public long getModificationStamp() {

+			return myModificationStamp;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setModificationStamp(long modificationStamp) {

+			myModificationStamp = modificationStamp;

+		}

+

+		/**

+		 * @generated

+		 */

+		public TransactionalEditingDomain getEditingDomain() {

+			return myDocument.getEditingDomain();

+		}

+

+		/**

+		 * @generated

+		 */

+		public ResourceSet getResourceSet() {

+			return getEditingDomain().getResourceSet();

+		}

+

+		/**

+		 * @generated

+		 */

+		public Iterator<Resource> getLoadedResourcesIterator() {

+			return new ArrayList<Resource>(getResourceSet().getResources())

+					.iterator();

+		}

+

+		/**

+		 * @generated

+		 */

+		public IEditorInput getEditorInput() {

+			return myEditorInput;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void dispose() {

+			stopResourceListening();

+			getResourceSet().eAdapters().remove(myResourceSetListener);

+			for (Iterator<Resource> it = getLoadedResourcesIterator(); it

+					.hasNext();) {

+				Resource resource = it.next();

+				resource.unload();

+			}

+			getEditingDomain().dispose();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isSynchronized() {

+			return myUnSynchronizedResources.size() == 0;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setUnSynchronized(Resource resource) {

+			myUnSynchronizedResources.add(resource);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setSynchronized(Resource resource) {

+			myUnSynchronizedResources.remove(resource);

+		}

+

+		/**

+		 * @generated

+		 */

+		public final void stopResourceListening() {

+			mySynchronizer.dispose();

+			mySynchronizer = null;

+		}

+

+		/**

+		 * @generated

+		 */

+		public final void startResourceListening() {

+			mySynchronizer = new WorkspaceSynchronizer(getEditingDomain(),

+					new SynchronizerDelegate());

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isUpdateCache() {

+			return myUpdateCache;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setUpdateCache(boolean update) {

+			myUpdateCache = update;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isModifiable() {

+			return myModifiable;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setModifiable(boolean modifiable) {

+			myModifiable = modifiable;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isReadOnly() {

+			return myReadOnly;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setReadOnly(boolean readOnly) {

+			myReadOnly = readOnly;

+		}

+

+		/**

+		 * @generated

+		 */

+		private class SynchronizerDelegate implements

+				WorkspaceSynchronizer.Delegate {

+

+			/**

+			 * @generated

+			 */

+			public void dispose() {

+			}

+

+			/**

+			 * @generated

+			 */

+			public boolean handleResourceChanged(final Resource resource) {

+				synchronized (ResourceSetInfo.this) {

+					if (ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				Display.getDefault().asyncExec(new Runnable() {

+					public void run() {

+						handleElementChanged(ResourceSetInfo.this, resource,

+								null);

+					}

+				});

+				return true;

+			}

+

+			/**

+			 * @generated

+			 */

+			public boolean handleResourceDeleted(Resource resource) {

+				synchronized (ResourceSetInfo.this) {

+					if (ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				Display.getDefault().asyncExec(new Runnable() {

+					public void run() {

+						fireElementDeleted(ResourceSetInfo.this

+								.getEditorInput());

+					}

+				});

+				return true;

+			}

+

+			/**

+			 * @generated

+			 */

+			public boolean handleResourceMoved(Resource resource,

+					final URI newURI) {

+				synchronized (ResourceSetInfo.this) {

+					if (ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				if (myDocument.getDiagram().eResource() == resource) {

+					Display.getDefault().asyncExec(new Runnable() {

+						public void run() {

+							handleElementMoved(

+									ResourceSetInfo.this.getEditorInput(),

+									newURI);

+						}

+					});

+				} else {

+					handleResourceDeleted(resource);

+				}

+				return true;

+			}

+

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	private class ResourceSetModificationListener extends EContentAdapter {

+

+		/**

+		 * @generated

+		 */

+		private NotificationFilter myModifiedFilter;

+

+		/**

+		 * @generated

+		 */

+		private ResourceSetInfo myInfo;

+

+		/**

+		 * @generated

+		 */

+		public ResourceSetModificationListener(ResourceSetInfo info) {

+			myInfo = info;

+			myModifiedFilter = NotificationFilter

+					.createEventTypeFilter(Notification.SET)

+					.or(NotificationFilter

+							.createEventTypeFilter(Notification.UNSET))

+					.and(NotificationFilter.createFeatureFilter(Resource.class,

+							Resource.RESOURCE__IS_MODIFIED));

+		}

+

+		/**

+		 * @generated

+		 */

+		public void notifyChanged(Notification notification) {

+			if (notification.getNotifier() instanceof ResourceSet) {

+				super.notifyChanged(notification);

+			}

+			if (!notification.isTouch()

+					&& myModifiedFilter.matches(notification)) {

+				if (notification.getNotifier() instanceof Resource) {

+					Resource resource = (Resource) notification.getNotifier();

+					if (resource.isLoaded()) {

+						boolean modified = false;

+						for (Iterator/*<org.eclipse.emf.ecore.resource.Resource>*/it = myInfo

+								.getLoadedResourcesIterator(); it.hasNext()

+								&& !modified;) {

+							Resource nextResource = (Resource) it.next();

+							if (nextResource.isLoaded()) {

+								modified = nextResource.isModified();

+							}

+						}

+						boolean dirtyStateChanged = false;

+						synchronized (myInfo) {

+							if (modified != myInfo.fCanBeSaved) {

+								myInfo.fCanBeSaved = modified;

+								dirtyStateChanged = true;

+							}

+							if (!resource.isModified()) {

+								myInfo.setSynchronized(resource);

+							}

+						}

+						if (dirtyStateChanged) {

+							fireElementDirtyStateChanged(

+									myInfo.getEditorInput(), modified);

+

+							if (!modified) {

+								myInfo.setModificationStamp(computeModificationStamp(myInfo));

+							}

+						}

+					}

+				}

+			}

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelElementChooserDialog.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelElementChooserDialog.java
new file mode 100644
index 0000000..98ee37c
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelElementChooserDialog.java
@@ -0,0 +1,403 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.util.Collections;

+

+import org.eclipse.core.resources.IContainer;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+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.util.EcoreUtil;

+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.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.dialogs.IDialogConstants;

+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.SelectionChangedEvent;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.jface.viewers.ViewerFilter;

+import org.eclipse.swt.SWT;

+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;

+import org.eclipse.ui.model.WorkbenchContentProvider;

+import org.eclipse.ui.model.WorkbenchLabelProvider;

+

+/**

+ * @generated

+ */

+public class ComrelElementChooserDialog extends Dialog {

+

+	/**

+	 * @generated

+	 */

+	private TreeViewer myTreeViewer;

+

+	/**

+	 * @generated

+	 */

+	private URI mySelectedModelElementURI;

+

+	/**

+	 * @generated

+	 */

+	private View myView;

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain myEditingDomain = GMFEditingDomainFactory.INSTANCE

+			.createEditingDomain();

+

+	/**

+	 * @generated

+	 */

+	public ComrelElementChooserDialog(Shell parentShell, View view) {

+		super(parentShell);

+		setShellStyle(getShellStyle() | SWT.RESIZE);

+		myView = view;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Control createDialogArea(Composite parent) {

+		Composite composite = (Composite) super.createDialogArea(parent);

+		getShell().setText(

+				Messages.ComrelElementChooserDialog_SelectModelElementTitle);

+		createModelBrowser(composite);

+		return composite;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Control createButtonBar(Composite parent) {

+		Control buttonBar = super.createButtonBar(parent);

+		setOkButtonEnabled(false);

+		return buttonBar;

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createModelBrowser(Composite composite) {

+		myTreeViewer = new TreeViewer(composite, SWT.SINGLE | SWT.H_SCROLL

+				| SWT.V_SCROLL | SWT.BORDER);

+		GridData layoutData = new GridData(GridData.FILL_BOTH);

+		layoutData.heightHint = 300;

+		layoutData.widthHint = 300;

+		myTreeViewer.getTree().setLayoutData(layoutData);

+		myTreeViewer.setContentProvider(new ModelElementsTreeContentProvider());

+		myTreeViewer.setLabelProvider(new ModelElementsTreeLabelProvider());

+		myTreeViewer.setInput(ResourcesPlugin.getWorkspace().getRoot());

+		myTreeViewer.addFilter(new ModelFilesFilter());

+		myTreeViewer.addSelectionChangedListener(new OkButtonEnabler());

+	}

+

+	/**

+	 * @generated

+	 */

+	private void setOkButtonEnabled(boolean enabled) {

+		getButton(IDialogConstants.OK_ID).setEnabled(enabled);

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isValidModelFile(IFile file) {

+		String fileExtension = file.getFullPath().getFileExtension();

+		return "comrel".equals(fileExtension); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public URI getSelectedModelElementURI() {

+		return mySelectedModelElementURI;

+	}

+

+	/**

+	 * @generated

+	 */

+	public int open() {

+		int result = super.open();

+		for (Resource resource : myEditingDomain.getResourceSet()

+				.getResources()) {

+			resource.unload();

+		}

+		myEditingDomain.dispose();

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private class ModelElementsTreeContentProvider implements

+			ITreeContentProvider {

+

+		/**

+		 * @generated

+		 */

+		private ITreeContentProvider myWorkbenchContentProvider = new WorkbenchContentProvider();

+

+		/**

+		 * @generated

+		 */

+		private AdapterFactoryContentProvider myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(

+				ComrelDiagramEditorPlugin.getInstance()

+						.getItemProvidersAdapterFactory());

+

+		/**

+		 * @generated

+		 */

+		public Object[] getChildren(Object parentElement) {

+			Object[] result = myWorkbenchContentProvider

+					.getChildren(parentElement);

+			if (result != null && result.length > 0) {

+				return result;

+			}

+			if (parentElement instanceof IFile) {

+				IFile modelFile = (IFile) parentElement;

+				IPath resourcePath = modelFile.getFullPath();

+				ResourceSet resourceSet = myEditingDomain.getResourceSet();

+				try {

+					Resource modelResource = resourceSet.getResource(

+							URI.createPlatformResourceURI(

+									resourcePath.toString(), true), true);

+					return myAdapterFctoryContentProvier

+							.getChildren(modelResource);

+				} catch (WrappedException e) {

+					ComrelDiagramEditorPlugin

+							.getInstance()

+							.logError(

+									"Unable to load resource: " + resourcePath.toString(), e); //$NON-NLS-1$

+				}

+				return Collections.EMPTY_LIST.toArray();

+			}

+			return myAdapterFctoryContentProvier.getChildren(parentElement);

+		}

+

+		/**

+		 * @generated

+		 */

+		public Object getParent(Object element) {

+			Object parent = myWorkbenchContentProvider.getParent(element);

+			if (parent != null) {

+				return parent;

+			}

+			if (element instanceof EObject) {

+				EObject eObject = (EObject) element;

+				if (eObject.eContainer() == null

+						&& eObject.eResource().getURI().isFile()) {

+					String path = eObject.eResource().getURI().path();

+					return ResourcesPlugin.getWorkspace().getRoot()

+							.getFileForLocation(new Path(path));

+				}

+				return myAdapterFctoryContentProvier.getParent(eObject);

+			}

+			return null;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean hasChildren(Object element) {

+			if (element instanceof IFile) {

+				return isValidModelFile((IFile) element);

+			}

+			return myWorkbenchContentProvider.hasChildren(element)

+					|| myAdapterFctoryContentProvier.hasChildren(element);

+		}

+

+		/**

+		 * @generated

+		 */

+		public Object[] getElements(Object inputElement) {

+			Object[] elements = myWorkbenchContentProvider

+					.getElements(inputElement);

+			return elements;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void dispose() {

+			myWorkbenchContentProvider.dispose();

+			myAdapterFctoryContentProvier.dispose();

+		}

+

+		/**

+		 * @generated

+		 */

+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+			myWorkbenchContentProvider.inputChanged(viewer, oldInput, newInput);

+			myAdapterFctoryContentProvier.inputChanged(viewer, oldInput,

+					newInput);

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	private class ModelElementsTreeLabelProvider implements ILabelProvider {

+

+		/**

+		 * @generated

+		 */

+		private WorkbenchLabelProvider myWorkbenchLabelProvider = new WorkbenchLabelProvider();

+

+		/**

+		 * @generated

+		 */

+		private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider(

+				ComrelDiagramEditorPlugin.getInstance()

+						.getItemProvidersAdapterFactory());

+

+		/**

+		 * @generated

+		 */

+		public Image getImage(Object element) {

+			Image result = myWorkbenchLabelProvider.getImage(element);

+			return result != null ? result : myAdapterFactoryLabelProvider

+					.getImage(element);

+		}

+

+		/**

+		 * @generated

+		 */

+		public String getText(Object element) {

+			String result = myWorkbenchLabelProvider.getText(element);

+			return result != null && result.length() > 0 ? result

+					: myAdapterFactoryLabelProvider.getText(element);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void addListener(ILabelProviderListener listener) {

+			myWorkbenchLabelProvider.addListener(listener);

+			myAdapterFactoryLabelProvider.addListener(listener);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void dispose() {

+			myWorkbenchLabelProvider.dispose();

+			myAdapterFactoryLabelProvider.dispose();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isLabelProperty(Object element, String property) {

+			return myWorkbenchLabelProvider.isLabelProperty(element, property)

+					|| myAdapterFactoryLabelProvider.isLabelProperty(element,

+							property);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void removeListener(ILabelProviderListener listener) {

+			myWorkbenchLabelProvider.removeListener(listener);

+			myAdapterFactoryLabelProvider.removeListener(listener);

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	private class ModelFilesFilter extends ViewerFilter {

+

+		/**

+		 * @generated

+		 */

+		public boolean select(Viewer viewer, Object parentElement,

+				Object element) {

+			if (element instanceof IContainer) {

+				return true;

+			}

+			if (element instanceof IFile) {

+				IFile file = (IFile) element;

+				return isValidModelFile(file);

+			}

+			return true;

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	private class OkButtonEnabler implements ISelectionChangedListener {

+

+		/**

+		 * @generated

+		 */

+		public void selectionChanged(SelectionChangedEvent event) {

+			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) {

+						EObject selectedModelElement = (EObject) selectedElement;

+						setOkButtonEnabled(ViewService

+								.getInstance()

+								.provides(

+										Node.class,

+										new EObjectAdapter(selectedModelElement),

+										myView,

+										null,

+										ViewUtil.APPEND,

+										true,

+										ComrelDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

+						mySelectedModelElementURI = EcoreUtil

+								.getURI(selectedModelElement);

+						return;

+					}

+				}

+			}

+			mySelectedModelElementURI = null;

+			setOkButtonEnabled(false);

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelInitDiagramFileAction.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelInitDiagramFileAction.java
new file mode 100644
index 0000000..d757cba
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelInitDiagramFileAction.java
@@ -0,0 +1,100 @@
+/*

+ * 

+ */

+package comrel.diagram.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.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IObjectActionDelegate;

+import org.eclipse.ui.IWorkbenchPart;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+

+/**

+ * @generated

+ */

+public class ComrelInitDiagramFileAction implements IObjectActionDelegate {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPart targetPart;

+

+	/**

+	 * @generated

+	 */

+	private URI domainModelURI;

+

+	/**

+	 * @generated

+	 */

+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

+		this.targetPart = targetPart;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void selectionChanged(IAction action, ISelection selection) {

+		domainModelURI = null;

+		action.setEnabled(false);

+		if (selection instanceof IStructuredSelection == false

+				|| selection.isEmpty()) {

+			return;

+		}

+		IFile file = (IFile) ((IStructuredSelection) selection)

+				.getFirstElement();

+		domainModelURI = URI.createPlatformResourceURI(file.getFullPath()

+				.toString(), true);

+		action.setEnabled(true);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Shell getShell() {

+		return targetPart.getSite().getShell();

+	}

+

+	/**

+	 * @generated

+	 */

+	public void run(IAction action) {

+		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE

+				.createEditingDomain();

+		ResourceSet resourceSet = editingDomain.getResourceSet();

+		EObject diagramRoot = null;

+		try {

+			Resource resource = resourceSet.getResource(domainModelURI, true);

+			diagramRoot = (EObject) resource.getContents().get(0);

+		} catch (WrappedException ex) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$

+		}

+		if (diagramRoot == null) {

+			MessageDialog.openError(getShell(),

+					Messages.InitDiagramFile_ResourceErrorDialogTitle,

+					Messages.InitDiagramFile_ResourceErrorDialogMessage);

+			return;

+		}

+		Wizard wizard = new ComrelNewDiagramFileWizard(domainModelURI,

+				diagramRoot, editingDomain);

+		wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle,

+				CompositeRefactoringEditPart.MODEL_ID));

+		ComrelDiagramEditorUtil

+				.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelLinkDescriptor.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelLinkDescriptor.java
new file mode 100644
index 0000000..e41084d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelLinkDescriptor.java
@@ -0,0 +1,96 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+

+/**

+ * @generated

+ */

+public class ComrelLinkDescriptor extends ComrelNodeDescriptor {

+

+	/**

+	 * @generated

+	 */

+	private EObject mySource;

+

+	/**

+	 * @generated

+	 */

+	private EObject myDestination;

+

+	/**

+	 * @generated

+	 */

+	private IAdaptable mySemanticAdapter;

+

+	/**

+	 * @generated

+	 */

+	private ComrelLinkDescriptor(EObject source, EObject destination,

+			EObject linkElement, int linkVID) {

+		super(linkElement, linkVID);

+		mySource = source;

+		myDestination = destination;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComrelLinkDescriptor(EObject source, EObject destination,

+			IElementType elementType, int linkVID) {

+		this(source, destination, (EObject) null, linkVID);

+		final IElementType elementTypeCopy = elementType;

+		mySemanticAdapter = new IAdaptable() {

+			public Object getAdapter(Class adapter) {

+				if (IElementType.class.equals(adapter)) {

+					return elementTypeCopy;

+				}

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComrelLinkDescriptor(EObject source, EObject destination,

+			EObject linkElement, IElementType elementType, int linkVID) {

+		this(source, destination, linkElement, linkVID);

+		final IElementType elementTypeCopy = elementType;

+		mySemanticAdapter = new EObjectAdapter(linkElement) {

+			public Object getAdapter(Class adapter) {

+				if (IElementType.class.equals(adapter)) {

+					return elementTypeCopy;

+				}

+				return super.getAdapter(adapter);

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public EObject getSource() {

+		return mySource;

+	}

+

+	/**

+	 * @generated

+	 */

+	public EObject getDestination() {

+		return myDestination;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IAdaptable getSemanticAdapter() {

+		return mySemanticAdapter;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelMatchingStrategy.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelMatchingStrategy.java
new file mode 100644
index 0000000..cb90883
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelMatchingStrategy.java
@@ -0,0 +1,39 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.emf.common.ui.URIEditorInput;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorMatchingStrategy;

+import org.eclipse.ui.IEditorReference;

+import org.eclipse.ui.PartInitException;

+

+/**

+ * @generated

+ */

+public class ComrelMatchingStrategy implements IEditorMatchingStrategy {

+

+	/**

+	 * @generated

+	 */

+	public boolean matches(IEditorReference editorRef, IEditorInput input) {

+		IEditorInput editorInput;

+		try {

+			editorInput = editorRef.getEditorInput();

+		} catch (PartInitException e) {

+			return false;

+		}

+

+		if (editorInput.equals(input)) {

+			return true;

+		}

+		if (editorInput instanceof URIEditorInput

+				&& input instanceof URIEditorInput) {

+			return ((URIEditorInput) editorInput).getURI().equals(

+					((URIEditorInput) input).getURI());

+		}

+		return false;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelNewDiagramFileWizard.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelNewDiagramFileWizard.java
new file mode 100644
index 0000000..e45adc8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelNewDiagramFileWizard.java
@@ -0,0 +1,203 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.io.IOException;

+import java.util.LinkedList;

+

+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.runtime.IPath;

+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.transaction.TransactionalEditingDomain;

+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.StructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+

+/**

+ * @generated

+ */

+public class ComrelNewDiagramFileWizard extends Wizard {

+

+	/**

+	 * @generated

+	 */

+	private WizardNewFileCreationPage myFileCreationPage;

+

+	/**

+	 * @generated

+	 */

+	private ModelElementSelectionPage diagramRootElementSelectionPage;

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain myEditingDomain;

+

+	/**

+	 * @generated

+	 */

+	public ComrelNewDiagramFileWizard(URI domainModelURI, EObject diagramRoot,

+			TransactionalEditingDomain editingDomain) {

+		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$

+		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$

+		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$

+

+		myFileCreationPage = new WizardNewFileCreationPage(

+				Messages.ComrelNewDiagramFileWizard_CreationPageName,

+				StructuredSelection.EMPTY);

+		myFileCreationPage

+				.setTitle(Messages.ComrelNewDiagramFileWizard_CreationPageTitle);

+		myFileCreationPage.setDescription(NLS.bind(

+				Messages.ComrelNewDiagramFileWizard_CreationPageDescription,

+				CompositeRefactoringEditPart.MODEL_ID));

+		IPath filePath;

+		String fileName = URI.decode(domainModelURI.trimFileExtension()

+				.lastSegment());

+		if (domainModelURI.isPlatformResource()) {

+			filePath = new Path(domainModelURI.trimSegments(1)

+					.toPlatformString(true));

+		} else if (domainModelURI.isFile()) {

+			filePath = new Path(domainModelURI.trimSegments(1).toFileString());

+		} else {

+			// TODO : use some default path

+			throw new IllegalArgumentException(

+					"Unsupported URI: " + domainModelURI); //$NON-NLS-1$

+		}

+		myFileCreationPage.setContainerFullPath(filePath);

+		myFileCreationPage.setFileName(ComrelDiagramEditorUtil

+				.getUniqueFileName(filePath, fileName, "comrel_diagram")); //$NON-NLS-1$

+

+		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(

+				Messages.ComrelNewDiagramFileWizard_RootSelectionPageName);

+		diagramRootElementSelectionPage

+				.setTitle(Messages.ComrelNewDiagramFileWizard_RootSelectionPageTitle);

+		diagramRootElementSelectionPage

+				.setDescription(Messages.ComrelNewDiagramFileWizard_RootSelectionPageDescription);

+		diagramRootElementSelectionPage.setModelElement(diagramRoot);

+

+		myEditingDomain = editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void addPages() {

+		addPage(myFileCreationPage);

+		addPage(diagramRootElementSelectionPage);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean performFinish() {

+		LinkedList<IFile> affectedFiles = new LinkedList<IFile>();

+		IFile diagramFile = myFileCreationPage.createNewFile();

+		ComrelDiagramEditorUtil.setCharset(diagramFile);

+		affectedFiles.add(diagramFile);

+		URI diagramModelURI = URI.createPlatformResourceURI(diagramFile

+				.getFullPath().toString(), true);

+		ResourceSet resourceSet = myEditingDomain.getResourceSet();

+		final Resource diagramResource = resourceSet

+				.createResource(diagramModelURI);

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(

+				myEditingDomain,

+				Messages.ComrelNewDiagramFileWizard_InitDiagramCommand,

+				affectedFiles) {

+

+			protected CommandResult doExecuteWithResult(

+					IProgressMonitor monitor, IAdaptable info)

+					throws ExecutionException {

+				int diagramVID = ComrelVisualIDRegistry

+						.getDiagramVisualID(diagramRootElementSelectionPage

+								.getModelElement());

+				if (diagramVID != CompositeRefactoringEditPart.VISUAL_ID) {

+					return CommandResult

+							.newErrorCommandResult(Messages.ComrelNewDiagramFileWizard_IncorrectRootError);

+				}

+				Diagram diagram = ViewService.createDiagram(

+						diagramRootElementSelectionPage.getModelElement(),

+						CompositeRefactoringEditPart.MODEL_ID,

+						ComrelDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				diagramResource.getContents().add(diagram);

+				return CommandResult.newOKCommandResult();

+			}

+		};

+		try {

+			OperationHistoryFactory.getOperationHistory().execute(command,

+					new NullProgressMonitor(), null);

+			diagramResource.save(ComrelDiagramEditorUtil.getSaveOptions());

+			ComrelDiagramEditorUtil.openDiagram(diagramResource);

+		} catch (ExecutionException e) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Unable to create model and diagram", e); //$NON-NLS-1$

+		} catch (IOException ex) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$

+		} catch (PartInitException ex) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Unable to open editor", ex); //$NON-NLS-1$

+		}

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class DiagramRootElementSelectionPage extends

+			ModelElementSelectionPage {

+

+		/**

+		 * @generated

+		 */

+		protected DiagramRootElementSelectionPage(String pageName) {

+			super(pageName);

+		}

+

+		/**

+		 * @generated

+		 */

+		protected String getSelectionTitle() {

+			return Messages.ComrelNewDiagramFileWizard_RootSelectionPageSelectionTitle;

+		}

+

+		/**

+		 * @generated

+		 */

+		protected boolean validatePage() {

+			if (selectedModelElement == null) {

+				setErrorMessage(Messages.ComrelNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);

+				return false;

+			}

+			boolean result = ViewService

+					.getInstance()

+					.provides(

+							new CreateDiagramViewOperation(

+									new EObjectAdapter(selectedModelElement),

+									CompositeRefactoringEditPart.MODEL_ID,

+									ComrelDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

+			setErrorMessage(result ? null

+					: Messages.ComrelNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);

+			return result;

+		}

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelNodeDescriptor.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelNodeDescriptor.java
new file mode 100644
index 0000000..aff2967
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelNodeDescriptor.java
@@ -0,0 +1,45 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * @generated

+ */

+public class ComrelNodeDescriptor {

+

+	/**

+	 * @generated

+	 */

+	private final EObject myModelElement;

+

+	/**

+	 * @generated

+	 */

+	private final int myVisualID;

+

+	/**

+	 * @generated

+	 */

+	public ComrelNodeDescriptor(EObject modelElement, int visualID) {

+		myModelElement = modelElement;

+		myVisualID = visualID;

+	}

+

+	/**

+	 * @generated

+	 */

+	public EObject getModelElement() {

+		return myModelElement;

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getVisualID() {

+		return myVisualID;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelPaletteFactory.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelPaletteFactory.java
new file mode 100644
index 0000000..e2bc74d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelPaletteFactory.java
@@ -0,0 +1,744 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.emf.common.util.BasicEList;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.gef.Tool;

+import org.eclipse.gef.palette.PaletteContainer;

+import org.eclipse.gef.palette.PaletteDrawer;

+import org.eclipse.gef.palette.PaletteRoot;

+import org.eclipse.gef.palette.ToolEntry;

+import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeConnectionTool;

+import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+

+import comrel.ModelRefactoring;

+import comrel.MultiFeatureHelper;

+import comrel.MultiFilterHelper;

+import comrel.SingleFeatureHelper;

+import comrel.SingleFilterHelper;

+import comrel.diagram.part.custom.ToolEntryComparator;

+import comrel.diagram.part.custom.UnspecifiedTypeCreationToolWithUnitId;

+import comrel.diagram.providers.ComrelElementTypes;

+import comrel.impl.CompositeRefactoringImpl;

+import comrel.util.ComrelUtil;

+import comrel.util.RegistryUtil;

+

+/**

+ * @generated

+ */

+public class ComrelPaletteFactory {

+

+	public static final String UNIT_ID = "UNIT_ID";

+

+	/**

+	 * @generated

+	 */

+	public void fillPalette(PaletteRoot paletteRoot) {

+		paletteRoot.add(createCompositeUnits1Group());

+		paletteRoot.add(createAtomicUnits2Group());

+		paletteRoot.add(createFilterUnits3Group());

+		paletteRoot.add(createFeatureUnits4Group());

+		paletteRoot.add(createPorts5Group());

+		paletteRoot.add(createMappings6Group());

+	}

+

+	/**

+	 * Erstellt alle nötigen Tooleinträge für alle verfügbaren AtomicUNits

+	 * 

+	 * @return

+	 */

+	private EList<ToolEntry> createAtomicUnits() {

+		EList<ToolEntry> erg = new BasicEList<ToolEntry>();

+		Collection<ModelRefactoring> refactorings = RegistryUtil

+				.getEmfRefactoringsAsModelRefactorings(CompositeRefactoringImpl.nsUri);

+		refactorings = ComrelUtil.sortAtomicRefactorings(refactorings);

+		List<IElementType> types;

+		for (ModelRefactoring ref : refactorings) {

+			if (ref.getNamespaceUri().equals(CompositeRefactoringImpl.nsUri)) {

+				types = new ArrayList<IElementType>(7); //(3) ???

+				types.add(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_2007);

+				types.add(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_3034);

+				types.add(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_3049);

+				types.add(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_3068);

+				types.add(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_3074);

+				types.add(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_3077);

+				types.add(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_3078);

+

+				NodeToolEntry entry = new NodeToolEntry(ref.getName(),

+						ref.getName(), types);

+				entry.setUnitId(ref.getRefId());

+				entry.setId(ref.getRefId()); //$NON-NLS-1$

+				entry.setSmallIcon(comrel.diagram.providers.ComrelElementTypes

+						.getImageDescriptor(comrel.diagram.providers.ComrelElementTypes.AtomicUnit_2007));

+				entry.setLargeIcon(entry.getSmallIcon());

+				erg.add(entry);

+			}

+		}

+

+		return erg;

+	}

+

+	/**

+	 * Erstellt alle nötigen Tooleinträge für alle verfügbaren FilterUnits

+	 * 

+	 * @return

+	 */

+	private EList<ToolEntry> createSingleFilterUnits() {

+		EList<ToolEntry> erg = new BasicEList<ToolEntry>();

+

+		Set<SingleFilterHelper> helper = RegistryUtil

+				.loadSingleFilterHelper(CompositeRefactoringImpl.nsUri);

+		List<IElementType> types;

+		NodeToolEntry entry;

+		for (SingleFilterHelper filter : helper) {

+			types = new ArrayList<IElementType>(5); //(1)???

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFilterUnit_3063);

+

+			entry = new NodeToolEntry(filter.getName(), filter.getName(), types);

+			entry.setUnitId(filter.getHelperId());

+			entry.setId(filter.getHelperId()); //$NON-NLS-1$

+			entry.setSmallIcon(comrel.diagram.providers.ComrelElementTypes

+					.getImageDescriptor(comrel.diagram.providers.ComrelElementTypes.SingleFilterUnit_3016));

+			entry.setLargeIcon(entry.getSmallIcon());

+			erg.add(entry);

+

+		}

+

+		return erg;

+	}

+

+	/**

+	 * Erstellt alle nötigen Tooleinträge für alle verfügbaren FilterUnits

+	 * 

+	 * @return

+	 */

+	private EList<ToolEntry> createMultiFilterUnits() {

+		EList<ToolEntry> erg = new BasicEList<ToolEntry>();

+

+		Set<MultiFilterHelper> helper = RegistryUtil

+				.loadMultiFilterHelper(CompositeRefactoringImpl.nsUri);

+		List<IElementType> types;

+		NodeToolEntry entry;

+		for (MultiFilterHelper filter : helper) {

+			types = new ArrayList<IElementType>(5); //(1)???

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFilterUnit_3019);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFilterUnit_3041);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFilterUnit_3053);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFilterUnit_3058);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFilterUnit_3064);

+

+			entry = new NodeToolEntry(filter.getName(), filter.getName(), types);

+			entry.setUnitId(filter.getHelperId());

+			entry.setId(filter.getHelperId()); //$NON-NLS-1$

+			entry.setSmallIcon(comrel.diagram.providers.ComrelElementTypes

+					.getImageDescriptor(comrel.diagram.providers.ComrelElementTypes.MultiFilterUnit_3019));

+			entry.setLargeIcon(entry.getSmallIcon());

+			erg.add(entry);

+

+		}

+

+		return erg;

+	}

+

+	/**

+	 * Erstellt alle nötigen Tooleinträge für alle verfügbaren

+	 * SingleFeatureUnits

+	 * 

+	 * @return

+	 */

+	private EList<ToolEntry> createSingleFeatureUnits() {

+		EList<ToolEntry> erg = new BasicEList<ToolEntry>();

+		Set<SingleFeatureHelper> helper = RegistryUtil

+				.loadSingleFeatureHelper(CompositeRefactoringImpl.nsUri);

+		List<IElementType> types;

+		NodeToolEntry entry;

+

+		for (SingleFeatureHelper singleFeature : helper) {

+			types = new ArrayList<IElementType>(5); // (1) ???

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(comrel.diagram.providers.ComrelElementTypes.SingleFeatureUnit_3061);

+

+			entry = new NodeToolEntry(singleFeature.getName(),

+					singleFeature.getName(), types);

+			entry.setUnitId(singleFeature.getHelperId());

+			entry.setId(singleFeature.getHelperId()); //$NON-NLS-1$

+			entry.setSmallIcon(comrel.diagram.providers.ComrelElementTypes

+					.getImageDescriptor(comrel.diagram.providers.ComrelElementTypes.SingleFeatureUnit_3008));

+			entry.setLargeIcon(entry.getSmallIcon());

+			erg.add(entry);

+

+		}

+

+		return erg;

+	}

+

+	/**

+	 * Erstellt alle nötigen Tooleinträge für alle verfügbaren MultiFeatureUnits

+	 * 

+	 * @return

+	 */

+	private EList<ToolEntry> createMultiFeatureUnits() {

+		EList<ToolEntry> erg = new BasicEList<ToolEntry>();

+		Set<MultiFeatureHelper> helper = RegistryUtil

+				.loadMultiFeatureHelper(CompositeRefactoringImpl.nsUri);

+		List<IElementType> types;

+		NodeToolEntry entry;

+

+		for (MultiFeatureHelper multiFeature : helper) {

+

+			types = new ArrayList<IElementType>(5); //(1) ???

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(comrel.diagram.providers.ComrelElementTypes.MultiFeatureUnit_3062);

+

+			entry = new NodeToolEntry(multiFeature.getName(),

+					multiFeature.getName(), types);

+			entry.setUnitId(multiFeature.getHelperId());

+			entry.setId(multiFeature.getHelperId()); //$NON-NLS-1$

+			entry.setSmallIcon(comrel.diagram.providers.ComrelElementTypes

+					.getImageDescriptor(comrel.diagram.providers.ComrelElementTypes.MultiFeatureUnit_3012));

+			entry.setLargeIcon(entry.getSmallIcon());

+			erg.add(entry);

+

+		}

+

+		return erg;

+	}

+

+	/**

+	 * Creates "Composite Units" palette tool group

+	 * @generated

+	 */

+	private PaletteContainer createCompositeUnits1Group() {

+		PaletteDrawer paletteContainer = new PaletteDrawer(

+				Messages.CompositeUnits1Group_title);

+		paletteContainer.setId("createCompositeUnits1Group"); //$NON-NLS-1$

+		paletteContainer.add(createCartesianQueuedUnit1CreationTool());

+		paletteContainer.add(createConditionCheck2CreationTool());

+		paletteContainer.add(createConditionalUnit3CreationTool());

+		paletteContainer.add(createParallelQueuedUnit4CreationTool());

+		paletteContainer.add(createSequentialUnit5CreationTool());

+		paletteContainer.add(createSingleQueuedUnit6CreationTool());

+		return paletteContainer;

+	}

+

+	/**

+	 * Creates "Atomic Units" palette tool group

+	 * @generated NOT

+	 */

+	private PaletteContainer createAtomicUnits2Group() {

+		PaletteDrawer paletteContainer = new PaletteDrawer(

+				Messages.AtomicUnits2Group_title);

+		paletteContainer.setId("createAtomicUnits2Group"); //$NON-NLS-1$

+		paletteContainer.addAll(this.createAtomicUnits());

+		return paletteContainer;

+	}

+

+	/**

+	 * Creates "Filter Units" palette tool group

+	 * @generated NOT

+	 */

+	private PaletteContainer createFilterUnits3Group() {

+		PaletteDrawer paletteContainer = new PaletteDrawer(

+				Messages.FilterUnits3Group_title);

+		paletteContainer.setId("createFilterUnits3Group"); //$NON-NLS-1$

+		ArrayList<ToolEntry> result = new ArrayList<ToolEntry>();

+		result.addAll(createSingleFilterUnits());

+		result.addAll(createMultiFilterUnits());

+		Collections.sort(result, new ToolEntryComparator());

+		paletteContainer.addAll(result);

+		return paletteContainer;

+	}

+

+	/**

+	 * Creates "Feature Units" palette tool group

+	 * @generated NOT

+	 */

+	private PaletteContainer createFeatureUnits4Group() {

+		PaletteDrawer paletteContainer = new PaletteDrawer(

+				Messages.FeatureUnits4Group_title);

+		paletteContainer.setId("createFeatureUnits4Group"); //$NON-NLS-1$

+		ArrayList<ToolEntry> result = new ArrayList<ToolEntry>();

+		result.addAll(createSingleFeatureUnits());

+		result.addAll(createMultiFeatureUnits());

+		Collections.sort(result, new ToolEntryComparator());

+		paletteContainer.addAll(result);

+		return paletteContainer;

+	}

+

+	/**

+	 * Creates "Ports" palette tool group

+	 * @generated NOT

+	 */

+	private PaletteContainer createPorts5Group() {

+		PaletteDrawer paletteContainer = new PaletteDrawer(

+				Messages.Ports5Group_title);

+		paletteContainer.setId("createPorts5Group"); //$NON-NLS-1$

+		paletteContainer.add(createMultiInputPort1CreationTool());

+		// paletteContainer.add(createMultiOutputPort2CreationTool());

+		paletteContainer.add(createSingleInputPort3CreationTool());

+		// paletteContainer.add(createSingleOutputPort4CreationTool());

+		return paletteContainer;

+	}

+

+	/**

+	 * Creates "Mappings" palette tool group

+	 * @generated

+	 */

+	private PaletteContainer createMappings6Group() {

+		PaletteDrawer paletteContainer = new PaletteDrawer(

+				Messages.Mappings6Group_title);

+		paletteContainer.setId("createMappings6Group"); //$NON-NLS-1$

+		paletteContainer.add(createMultiPortMapping1CreationTool());

+		paletteContainer.add(createMultiSinglePortMapping2CreationTool());

+		paletteContainer.add(createSinglePortMapping3CreationTool());

+		return paletteContainer;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createCartesianQueuedUnit1CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(7);

+		types.add(ComrelElementTypes.CartesianQueuedUnit_2002);

+		types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+		types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+		types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+		types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+		types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+		types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.CartesianQueuedUnit1CreationTool_title,

+				Messages.CartesianQueuedUnit1CreationTool_desc, types);

+		entry.setId("createCartesianQueuedUnit1CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.CartesianQueuedUnit_2002));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createConditionCheck2CreationTool() {

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.ConditionCheck2CreationTool_title,

+				Messages.ConditionCheck2CreationTool_desc,

+				Collections

+						.singletonList(ComrelElementTypes.ConditionCheck_3076));

+		entry.setId("createConditionCheck2CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.ConditionCheck_3076));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createConditionalUnit3CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(7);

+		types.add(ComrelElementTypes.ConditionalUnit_3030);

+		types.add(ComrelElementTypes.ConditionalUnit_3046);

+		types.add(ComrelElementTypes.ConditionalUnit_3066);

+		types.add(ComrelElementTypes.ConditionalUnit_3071);

+		types.add(ComrelElementTypes.ConditionalUnit_3072);

+		types.add(ComrelElementTypes.ConditionalUnit_3075);

+		types.add(ComrelElementTypes.ConditionalUnit_2006);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.ConditionalUnit3CreationTool_title,

+				Messages.ConditionalUnit3CreationTool_desc, types);

+		entry.setId("createConditionalUnit3CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.ConditionalUnit_3030));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createParallelQueuedUnit4CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(7);

+		types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+		types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+		types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+		types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+		types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+		types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+		types.add(ComrelElementTypes.ParallelQueuedUnit_2003);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.ParallelQueuedUnit4CreationTool_title,

+				Messages.ParallelQueuedUnit4CreationTool_desc, types);

+		entry.setId("createParallelQueuedUnit4CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.ParallelQueuedUnit_3004));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createSequentialUnit5CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(7);

+		types.add(ComrelElementTypes.SequentialUnit_3026);

+		types.add(ComrelElementTypes.SequentialUnit_3044);

+		types.add(ComrelElementTypes.SequentialUnit_3060);

+		types.add(ComrelElementTypes.SequentialUnit_3069);

+		types.add(ComrelElementTypes.SequentialUnit_3070);

+		types.add(ComrelElementTypes.SequentialUnit_3073);

+		types.add(ComrelElementTypes.SequentialUnit_2005);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.SequentialUnit5CreationTool_title,

+				Messages.SequentialUnit5CreationTool_desc, types);

+		entry.setId("createSequentialUnit5CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.SequentialUnit_3026));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createSingleQueuedUnit6CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(7);

+		types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+		types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+		types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+		types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+		types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+		types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+		types.add(ComrelElementTypes.SingleQueuedUnit_2004);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.SingleQueuedUnit6CreationTool_title,

+				Messages.SingleQueuedUnit6CreationTool_desc, types);

+		entry.setId("createSingleQueuedUnit6CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.SingleQueuedUnit_3022));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createAtomicUnit1CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(7);

+		types.add(ComrelElementTypes.AtomicUnit_3034);

+		types.add(ComrelElementTypes.AtomicUnit_3049);

+		types.add(ComrelElementTypes.AtomicUnit_3068);

+		types.add(ComrelElementTypes.AtomicUnit_3074);

+		types.add(ComrelElementTypes.AtomicUnit_3077);

+		types.add(ComrelElementTypes.AtomicUnit_3078);

+		types.add(ComrelElementTypes.AtomicUnit_2007);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.AtomicUnit1CreationTool_title,

+				Messages.AtomicUnit1CreationTool_desc, types);

+		entry.setId("createAtomicUnit1CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.AtomicUnit_3034));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createMultiFilterUnit1CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(5);

+		types.add(ComrelElementTypes.MultiFilterUnit_3019);

+		types.add(ComrelElementTypes.MultiFilterUnit_3041);

+		types.add(ComrelElementTypes.MultiFilterUnit_3053);

+		types.add(ComrelElementTypes.MultiFilterUnit_3058);

+		types.add(ComrelElementTypes.MultiFilterUnit_3064);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.MultiFilterUnit1CreationTool_title,

+				Messages.MultiFilterUnit1CreationTool_desc, types);

+		entry.setId("createMultiFilterUnit1CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.MultiFilterUnit_3019));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createSingleFilterUnit2CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(5);

+		types.add(ComrelElementTypes.SingleFilterUnit_3016);

+		types.add(ComrelElementTypes.SingleFilterUnit_3040);

+		types.add(ComrelElementTypes.SingleFilterUnit_3052);

+		types.add(ComrelElementTypes.SingleFilterUnit_3057);

+		types.add(ComrelElementTypes.SingleFilterUnit_3063);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.SingleFilterUnit2CreationTool_title,

+				Messages.SingleFilterUnit2CreationTool_desc, types);

+		entry.setId("createSingleFilterUnit2CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.SingleFilterUnit_3016));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createMultiFeatureUnit1CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(5);

+		types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+		types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+		types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+		types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+		types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.MultiFeatureUnit1CreationTool_title,

+				Messages.MultiFeatureUnit1CreationTool_desc, types);

+		entry.setId("createMultiFeatureUnit1CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.MultiFeatureUnit_3012));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createSingleFeatureUnit2CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(5);

+		types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+		types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+		types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+		types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+		types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.SingleFeatureUnit2CreationTool_title,

+				Messages.SingleFeatureUnit2CreationTool_desc, types);

+		entry.setId("createSingleFeatureUnit2CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.SingleFeatureUnit_3008));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createMultiInputPort1CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(9);

+		types.add(ComrelElementTypes.MultiInputPort_3002);

+		types.add(ComrelElementTypes.MultiInputPort_3006);

+		types.add(ComrelElementTypes.MultiInputPort_3010);

+		types.add(ComrelElementTypes.MultiInputPort_3014);

+		types.add(ComrelElementTypes.MultiInputPort_3017);

+		types.add(ComrelElementTypes.MultiInputPort_3020);

+		types.add(ComrelElementTypes.MultiInputPort_3024);

+		types.add(ComrelElementTypes.MultiInputPort_3028);

+		types.add(ComrelElementTypes.MultiInputPort_3032);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.MultiInputPort1CreationTool_title,

+				Messages.MultiInputPort1CreationTool_desc, types);

+		entry.setId("createMultiInputPort1CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.MultiInputPort_3002));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createMultiOutputPort2CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.MultiOutputPort_3015);

+		types.add(ComrelElementTypes.MultiOutputPort_3021);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.MultiOutputPort2CreationTool_title,

+				Messages.MultiOutputPort2CreationTool_desc, types);

+		entry.setId("createMultiOutputPort2CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.MultiOutputPort_3015));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createSingleInputPort3CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(9);

+		types.add(ComrelElementTypes.SingleInputPort_2001);

+		types.add(ComrelElementTypes.SingleInputPort_3001);

+		types.add(ComrelElementTypes.SingleInputPort_3005);

+		types.add(ComrelElementTypes.SingleInputPort_3009);

+		types.add(ComrelElementTypes.SingleInputPort_3013);

+		types.add(ComrelElementTypes.SingleInputPort_3023);

+		types.add(ComrelElementTypes.SingleInputPort_3027);

+		types.add(ComrelElementTypes.SingleInputPort_3031);

+		types.add(ComrelElementTypes.SingleInputPort_3035);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.SingleInputPort3CreationTool_title,

+				Messages.SingleInputPort3CreationTool_desc, types);

+		entry.setId("createSingleInputPort3CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.SingleInputPort_2001));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createSingleOutputPort4CreationTool() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(ComrelElementTypes.SingleOutputPort_3011);

+		types.add(ComrelElementTypes.SingleOutputPort_3018);

+		NodeToolEntry entry = new NodeToolEntry(

+				Messages.SingleOutputPort4CreationTool_title,

+				Messages.SingleOutputPort4CreationTool_desc, types);

+		entry.setId("createSingleOutputPort4CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.SingleOutputPort_3011));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createMultiPortMapping1CreationTool() {

+		LinkToolEntry entry = new LinkToolEntry(

+				Messages.MultiPortMapping1CreationTool_title,

+				Messages.MultiPortMapping1CreationTool_desc,

+				Collections

+						.singletonList(ComrelElementTypes.MultiPortMapping_4002));

+		entry.setId("createMultiPortMapping1CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.MultiPortMapping_4002));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createMultiSinglePortMapping2CreationTool() {

+		LinkToolEntry entry = new LinkToolEntry(

+				Messages.MultiSinglePortMapping2CreationTool_title,

+				Messages.MultiSinglePortMapping2CreationTool_desc,

+				Collections

+						.singletonList(ComrelElementTypes.MultiSinglePortMapping_4003));

+		entry.setId("createMultiSinglePortMapping2CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.MultiSinglePortMapping_4003));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ToolEntry createSinglePortMapping3CreationTool() {

+		LinkToolEntry entry = new LinkToolEntry(

+				Messages.SinglePortMapping3CreationTool_title,

+				Messages.SinglePortMapping3CreationTool_desc,

+				Collections

+						.singletonList(ComrelElementTypes.SinglePortMapping_4001));

+		entry.setId("createSinglePortMapping3CreationTool"); //$NON-NLS-1$

+		entry.setSmallIcon(ComrelElementTypes

+				.getImageDescriptor(ComrelElementTypes.SinglePortMapping_4001));

+		entry.setLargeIcon(entry.getSmallIcon());

+		return entry;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class NodeToolEntry extends ToolEntry {

+

+		String unitId = "";

+

+		/**

+		 * @generated

+		 */

+		private final List<IElementType> elementTypes;

+

+		/**

+		 * @generated

+		 */

+		private NodeToolEntry(String title, String description,

+				List<IElementType> elementTypes) {

+			super(title, description, null, null);

+			this.elementTypes = elementTypes;

+		}

+

+		/**

+		 * @generated NOT

+		 */

+		public Tool createTool() {

+			/*

+			 * change: UnspecifiedTypeCReateionTool ->

+			 * UnspecifiedTypeCreationToolWithUnitId

+			 */

+			UnspecifiedTypeCreationTool tool = new UnspecifiedTypeCreationToolWithUnitId(

+					elementTypes, unitId);

+			Map prop = getToolProperties();

+			tool.setProperties(prop);

+			return tool;

+		}

+

+		public void setUnitId(String unitId) {

+			this.unitId = unitId;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class LinkToolEntry extends ToolEntry {

+

+		/**

+		 * @generated

+		 */

+		private final List<IElementType> relationshipTypes;

+

+		/**

+		 * @generated

+		 */

+		private LinkToolEntry(String title, String description,

+				List<IElementType> relationshipTypes) {

+			super(title, description, null, null);

+			this.relationshipTypes = relationshipTypes;

+		}

+

+		/**

+		 * @generated

+		 */

+		public Tool createTool() {

+			Tool tool = new UnspecifiedTypeConnectionTool(relationshipTypes);

+			tool.setProperties(getToolProperties());

+			return tool;

+		}

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelShortcutPropertyTester.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelShortcutPropertyTester.java
new file mode 100644
index 0000000..93c8c34
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelShortcutPropertyTester.java
@@ -0,0 +1,41 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.core.expressions.PropertyTester;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+

+/**

+ * @generated

+ */

+public class ComrelShortcutPropertyTester extends PropertyTester {

+

+	/**

+	 * @generated

+	 */

+	protected static final String SHORTCUT_PROPERTY = "isShortcut"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public boolean test(Object receiver, String method, Object[] args,

+			Object expectedValue) {

+		if (false == receiver instanceof View) {

+			return false;

+		}

+		View view = (View) receiver;

+		if (SHORTCUT_PROPERTY.equals(method)) {

+			EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+			if (annotation != null) {

+				return CompositeRefactoringEditPart.MODEL_ID.equals(annotation

+						.getDetails().get("modelID")); //$NON-NLS-1$

+			}

+		}

+		return false;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelUriEditorInputTester.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelUriEditorInputTester.java
new file mode 100644
index 0000000..7db9460
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelUriEditorInputTester.java
@@ -0,0 +1,26 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.core.expressions.PropertyTester;

+import org.eclipse.emf.common.ui.URIEditorInput;

+

+/**

+ * @generated

+ */

+public class ComrelUriEditorInputTester extends PropertyTester {

+

+	/**

+	 * @generated

+	 */

+	public boolean test(Object receiver, String method, Object[] args,

+			Object expectedValue) {

+		if (false == receiver instanceof URIEditorInput) {

+			return false;

+		}

+		URIEditorInput editorInput = (URIEditorInput) receiver;

+		return "comrel_diagram".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelVisualIDRegistry.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelVisualIDRegistry.java
new file mode 100644
index 0000000..c61872f
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ComrelVisualIDRegistry.java
@@ -0,0 +1,5058 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.CompositeRefactoring;

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.*;

+

+/**

+ * 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 ComrelVisualIDRegistry {

+

+	/**

+	 * @generated

+	 */

+	private static final String DEBUG_KEY = "comrel.diagram/debug/visualID"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static int getVisualID(View view) {

+		if (view instanceof Diagram) {

+			if (CompositeRefactoringEditPart.MODEL_ID.equals(view.getType())) {

+				return CompositeRefactoringEditPart.VISUAL_ID;

+			} else {

+				return -1;

+			}

+		}

+		return comrel.diagram.part.ComrelVisualIDRegistry.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))) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Unable to parse view type as a visualID number: "

+								+ type);

+			}

+		}

+		return -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String getType(int visualID) {

+		return Integer.toString(visualID);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static int getDiagramVisualID(EObject domainElement) {

+		if (domainElement == null) {

+			return -1;

+		}

+		if (ComrelPackage.eINSTANCE.getCompositeRefactoring().isSuperTypeOf(

+				domainElement.eClass())

+				&& isDiagram((CompositeRefactoring) domainElement)) {

+			return CompositeRefactoringEditPart.VISUAL_ID;

+		}

+		return -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static int getNodeVisualID(View containerView, EObject domainElement) {

+		if (domainElement == null) {

+			return -1;

+		}

+		String containerModelID = comrel.diagram.part.ComrelVisualIDRegistry

+				.getModelID(containerView);

+		if (!CompositeRefactoringEditPart.MODEL_ID.equals(containerModelID)

+				&& !"comrel".equals(containerModelID)) { //$NON-NLS-1$

+			return -1;

+		}

+		int containerVisualID;

+		if (CompositeRefactoringEditPart.MODEL_ID.equals(containerModelID)) {

+			containerVisualID = comrel.diagram.part.ComrelVisualIDRegistry

+					.getVisualID(containerView);

+		} else {

+			if (containerView instanceof Diagram) {

+				containerVisualID = CompositeRefactoringEditPart.VISUAL_ID;

+			} else {

+				return -1;

+			}

+		}

+		switch (containerVisualID) {

+		case CompositeRefactoringEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPortEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort7EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort8EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort8EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case AtomicUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort7EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort8EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort8EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case AtomicUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort7EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort8EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort8EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case AtomicUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort7EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort7EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort8EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPortEditPart.VISUAL_ID;

+			}

+			break;

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiOutputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiOutputPort2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort7EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort8EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort7EditPart.VISUAL_ID;

+			}

+			break;

+		case AtomicUnit4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort8EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnit6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort8EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort8EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort8EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnit7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort8EditPart.VISUAL_ID;

+			}

+			break;

+		case AtomicUnit5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort8EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case AtomicUnit6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case AtomicUnit7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleInputPort().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleInputPort9EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getConditionCheck().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionCheckEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit6EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit7EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getConditionCheck().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionCheckEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit6EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit7EditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnitEditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnitEditPart.VISUAL_ID;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getConditionCheck().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionCheckEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit6EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit7EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getConditionCheck().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionCheckEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit6EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit7EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getConditionCheck().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionCheckEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit6EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit7EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getConditionCheck().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionCheckEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit6EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit7EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit2EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit2EditPart.VISUAL_ID;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit4EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit5EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getConditionCheck().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionCheckEditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getSingleFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFeatureUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFeatureUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleFilterUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getMultiFilterUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return MultiFilterUnit3EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit3EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit4EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit5EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit6EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit6EditPart.VISUAL_ID;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID:

+			if (ComrelPackage.eINSTANCE.getCartesianQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return CartesianQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getParallelQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ParallelQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSingleQueuedUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SingleQueuedUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getSequentialUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return SequentialUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getConditionalUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return ConditionalUnit7EditPart.VISUAL_ID;

+			}

+			if (ComrelPackage.eINSTANCE.getAtomicUnit().isSuperTypeOf(

+					domainElement.eClass())) {

+				return AtomicUnit7EditPart.VISUAL_ID;

+			}

+			break;

+		}

+		return -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean canCreateNode(View containerView, int nodeVisualID) {

+		String containerModelID = comrel.diagram.part.ComrelVisualIDRegistry

+				.getModelID(containerView);

+		if (!CompositeRefactoringEditPart.MODEL_ID.equals(containerModelID)

+				&& !"comrel".equals(containerModelID)) { //$NON-NLS-1$

+			return false;

+		}

+		int containerVisualID;

+		if (CompositeRefactoringEditPart.MODEL_ID.equals(containerModelID)) {

+			containerVisualID = comrel.diagram.part.ComrelVisualIDRegistry

+					.getVisualID(containerView);

+		} else {

+			if (containerView instanceof Diagram) {

+				containerVisualID = CompositeRefactoringEditPart.VISUAL_ID;

+			} else {

+				return false;

+			}

+		}

+		switch (containerVisualID) {

+		case CompositeRefactoringEditPart.VISUAL_ID:

+			if (SingleInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPortEditPart.VISUAL_ID:

+			if (SingleInputPortNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			if (CartesianQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			if (ParallelQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			if (SingleQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitEditPart.VISUAL_ID:

+			if (SequentialUnitNameTypeLblStrictEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitEditPart.VISUAL_ID:

+			if (ConditionalUnitNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AtomicUnitEditPart.VISUAL_ID:

+			if (AtomicUnitLabelTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort2EditPart.VISUAL_ID:

+			if (SingleInputPortNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPortEditPart.VISUAL_ID:

+			if (MultiInputPortNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			if (CartesianQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			if (ParallelQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort3EditPart.VISUAL_ID:

+			if (SingleInputPortNameType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort2EditPart.VISUAL_ID:

+			if (MultiInputPortNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			if (CartesianQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			if (SingleFeatureUnitNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort4EditPart.VISUAL_ID:

+			if (SingleInputPortNameType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort3EditPart.VISUAL_ID:

+			if (MultiInputPortNameType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleOutputPortEditPart.VISUAL_ID:

+			if (SingleOutputPortNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			if (MultiFeatureUnitNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort5EditPart.VISUAL_ID:

+			if (SingleInputPortNameType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort4EditPart.VISUAL_ID:

+			if (MultiInputPortNameType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiOutputPortEditPart.VISUAL_ID:

+			if (MultiOutputPortNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			if (SingleFilterUnitNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort5EditPart.VISUAL_ID:

+			if (MultiInputPortNameType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			if (SingleOutputPortNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			if (MultiFilterUnitNameTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort6EditPart.VISUAL_ID:

+			if (MultiInputPortNameType6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			if (MultiOutputPortNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			if (SingleQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort6EditPart.VISUAL_ID:

+			if (SingleInputPortNameType6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort7EditPart.VISUAL_ID:

+			if (MultiInputPortNameType7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			if (CartesianQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnit2EditPart.VISUAL_ID:

+			if (SequentialUnitNameTypeLblStrict2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort7EditPart.VISUAL_ID:

+			if (SingleInputPortNameType7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort8EditPart.VISUAL_ID:

+			if (MultiInputPortNameType8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			if (CartesianQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			if (ConditionalUnitNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort8EditPart.VISUAL_ID:

+			if (SingleInputPortNameType8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiInputPort9EditPart.VISUAL_ID:

+			if (MultiInputPortNameType9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			if (CartesianQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AtomicUnit2EditPart.VISUAL_ID:

+			if (AtomicUnitLabelType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleInputPort9EditPart.VISUAL_ID:

+			if (SingleInputPortNameType9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			if (ParallelQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			if (ParallelQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			if (SingleFeatureUnitNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			if (MultiFeatureUnitNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			if (SingleFilterUnitNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			if (MultiFilterUnitNameType2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			if (SingleQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			if (ParallelQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnit3EditPart.VISUAL_ID:

+			if (SequentialUnitNameTypeLblStrict3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			if (ParallelQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			if (ConditionalUnitNameType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			if (CartesianQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			if (ParallelQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AtomicUnit3EditPart.VISUAL_ID:

+			if (AtomicUnitLabelType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			if (SingleFeatureUnitNameType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			if (MultiFeatureUnitNameType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			if (SingleFilterUnitNameType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			if (MultiFilterUnitNameType3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			if (SingleQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			if (SingleFeatureUnitNameType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			if (MultiFeatureUnitNameType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			if (SingleFilterUnitNameType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			if (MultiFilterUnitNameType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			if (SingleQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnit4EditPart.VISUAL_ID:

+			if (SequentialUnitNameTypeLblStrict4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			if (SingleFeatureUnitNameType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			if (MultiFeatureUnitNameType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			if (SingleFilterUnitNameType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			if (MultiFilterUnitNameType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiOutputPort2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			if (SingleQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			if (ConditionalUnitNameType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			if (SingleQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AtomicUnit4EditPart.VISUAL_ID:

+			if (AtomicUnitLabelType4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnit5EditPart.VISUAL_ID:

+			if (SequentialUnitNameTypeLblStrict5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnit6EditPart.VISUAL_ID:

+			if (SequentialUnitNameTypeLblStrict6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			if (ConditionalUnitNameType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			if (ConditionalUnitNameType6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnit7EditPart.VISUAL_ID:

+			if (SequentialUnitNameTypeLblStrict7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AtomicUnit5EditPart.VISUAL_ID:

+			if (AtomicUnitLabelType5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			if (ConditionalUnitNameType7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort8EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionCheckEditPart.VISUAL_ID:

+			if (ConditionCheckNameTypeSpecEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AtomicUnit6EditPart.VISUAL_ID:

+			if (AtomicUnitLabelType6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AtomicUnit7EditPart.VISUAL_ID:

+			if (AtomicUnitLabelType7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleInputPort9EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (SingleFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+			if (CartesianQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (SingleFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (SingleFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+			if (CartesianQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (SingleFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (SingleFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID:

+			if (CartesianQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (SingleFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (SingleFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID:

+			if (CartesianQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (SingleFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID:

+			if (ConditionCheckEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID:

+			if (SingleFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID:

+			if (CartesianQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID:

+			if (CartesianQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (SingleFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (SingleFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (SingleFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (SingleFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (SingleFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (SingleFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (SingleFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID:

+			if (ConditionCheckEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID:

+			if (SingleFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (SingleFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnitEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (SingleFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (SingleFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (SingleFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (SingleFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (SingleFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID:

+			if (ConditionCheckEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID:

+			if (SingleFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (SingleFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (SingleFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (SingleFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID:

+			if (ConditionCheckEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID:

+			if (SingleFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID:

+			if (ConditionCheckEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID:

+			if (SingleFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (SingleFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID:

+			if (ConditionCheckEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID:

+			if (SingleFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (SingleFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit2EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (SingleFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (SingleFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID:

+			if (ConditionCheckEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID:

+			if (SingleFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFeatureUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (MultiFilterUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit3EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit4EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit5EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit6EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID:

+			if (CartesianQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ParallelQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SingleQueuedUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (SequentialUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (ConditionalUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if (AtomicUnit7EditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static int getLinkWithClassVisualID(EObject domainElement) {

+		if (domainElement == null) {

+			return -1;

+		}

+		if (ComrelPackage.eINSTANCE.getSinglePortMapping().isSuperTypeOf(

+				domainElement.eClass())) {

+			return SinglePortMappingEditPart.VISUAL_ID;

+		}

+		if (ComrelPackage.eINSTANCE.getMultiPortMapping().isSuperTypeOf(

+				domainElement.eClass())) {

+			return MultiPortMappingEditPart.VISUAL_ID;

+		}

+		if (ComrelPackage.eINSTANCE.getMultiSinglePortMapping().isSuperTypeOf(

+				domainElement.eClass())) {

+			return MultiSinglePortMappingEditPart.VISUAL_ID;

+		}

+		return -1;

+	}

+

+	/**

+	 * User can change implementation of this method to handle some specific

+	 * situations not covered by default logic.

+	 * 

+	 * @generated

+	 */

+	private static boolean isDiagram(CompositeRefactoring element) {

+		return true;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/DeleteElementAction.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/DeleteElementAction.java
new file mode 100644
index 0000000..654cc48
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/DeleteElementAction.java
@@ -0,0 +1,91 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.diagram.ui.actions.AbstractDeleteFromAction;

+import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;

+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.l10n.DiagramUIMessages;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.ui.ISharedImages;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * @generated

+ */

+public class DeleteElementAction extends AbstractDeleteFromAction {

+

+	/**

+	 * @generated

+	 */

+	public DeleteElementAction(IWorkbenchPart part) {

+		super(part);

+	}

+

+	/**

+	 * @generated

+	 */

+	public DeleteElementAction(IWorkbenchPage workbenchPage) {

+		super(workbenchPage);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init() {

+		super.init();

+		setId(ActionIds.ACTION_DELETE_FROM_MODEL);

+		setText(DiagramUIMessages.DiagramEditor_Delete_from_Model);

+		setToolTipText(DiagramUIMessages.DiagramEditor_Delete_from_ModelToolTip);

+		ISharedImages workbenchImages = PlatformUI.getWorkbench()

+				.getSharedImages();

+		setHoverImageDescriptor(workbenchImages

+				.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));

+		setImageDescriptor(workbenchImages

+				.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));

+		setDisabledImageDescriptor(workbenchImages

+				.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getCommandLabel() {

+		return DiagramUIMessages.DiagramEditor_Delete_from_Model;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCommand(Request request) {

+		List operationSet = getOperationSet();

+		if (operationSet.isEmpty()) {

+			return UnexecutableCommand.INSTANCE;

+		}

+		Iterator editParts = operationSet.iterator();

+		CompositeTransactionalCommand command = new CompositeTransactionalCommand(

+				getEditingDomain(), getCommandLabel());

+		while (editParts.hasNext()) {

+			EditPart editPart = (EditPart) editParts.next();

+			Command curCommand = editPart.getCommand(request);

+			if (curCommand != null) {

+				command.compose(new CommandProxy(curCommand));

+			}

+		}

+		if (command.isEmpty() || command.size() != operationSet.size()) {

+			return UnexecutableCommand.INSTANCE;

+		}

+		return new ICommandProxy(command);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/DiagramEditorContextMenuProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/DiagramEditorContextMenuProvider.java
new file mode 100644
index 0000000..6c2676d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/DiagramEditorContextMenuProvider.java
@@ -0,0 +1,78 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;

+import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;

+import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.ui.IWorkbenchPart;

+

+/**

+ * @generated

+ */

+public class DiagramEditorContextMenuProvider extends

+		DiagramContextMenuProvider {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPart part;

+

+	/**

+	 * @generated

+	 */

+	private DeleteElementAction deleteAction;

+

+	/**

+	 * @generated

+	 */

+	public DiagramEditorContextMenuProvider(IWorkbenchPart part,

+			EditPartViewer viewer) {

+		super(part, viewer);

+		this.part = part;

+		deleteAction = new DeleteElementAction(part);

+		deleteAction.init();

+	}

+

+	/**

+	 * @generated

+	 */

+	public void dispose() {

+		if (deleteAction != null) {

+			deleteAction.dispose();

+			deleteAction = null;

+		}

+		super.dispose();

+	}

+

+	/**

+	 * @generated

+	 */

+	public void buildContextMenu(final IMenuManager menu) {

+		getViewer().flush();

+		try {

+			TransactionUtil.getEditingDomain(

+					(EObject) getViewer().getContents().getModel())

+					.runExclusive(new Runnable() {

+

+						public void run() {

+							ContributionItemService

+									.getInstance()

+									.contributeToPopupMenu(

+											DiagramEditorContextMenuProvider.this,

+											part);

+							menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);

+							menu.appendToGroup("editGroup", deleteAction);

+						}

+					});

+		} catch (Exception e) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Error building context menu", e);

+		}

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/LoadResourceAction.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/LoadResourceAction.java
new file mode 100644
index 0000000..01cd381
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/LoadResourceAction.java
@@ -0,0 +1,34 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.handlers.HandlerUtil;

+

+/**

+ * @generated

+ */

+public class LoadResourceAction extends AbstractHandler {

+	/**

+	 * @generated

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		IEditorPart diagramEditor = HandlerUtil.getActiveEditorChecked(event);

+		Shell shell = diagramEditor.getEditorSite().getShell();

+		assert diagramEditor instanceof DiagramEditor;

+		TransactionalEditingDomain editingDomain = ((DiagramEditor) diagramEditor)

+				.getEditingDomain();

+		org.eclipse.emf.edit.ui.action.LoadResourceAction.LoadResourceDialog loadResourceDialog = new org.eclipse.emf.edit.ui.action.LoadResourceAction.LoadResourceDialog(

+				shell, editingDomain);

+		loadResourceDialog.open();

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/Messages.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/Messages.java
new file mode 100644
index 0000000..1f75066
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/Messages.java
@@ -0,0 +1,1152 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.osgi.util.NLS;

+

+/**

+ * @generated

+ */

+public class Messages extends NLS {

+

+	/**

+	 * @generated

+	 */

+	static {

+		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	private Messages() {

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizardTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizard_DiagramModelFilePageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizard_DiagramModelFilePageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizard_DomainModelFilePageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizard_DomainModelFilePageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizardOpenEditorError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizardCreationError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelCreationWizardPageExtensionError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditorUtil_OpenModelResourceErrorDialogTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditorUtil_OpenModelResourceErrorDialogMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditorUtil_CreateDiagramProgressTask;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditorUtil_CreateDiagramCommandLabel;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_isModifiable;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_handleElementContentChanged;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_IncorrectInputError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_NoDiagramInResourceError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_DiagramLoadingError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_UnsynchronizedFileSaveError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_SaveDiagramTask;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_SaveNextResourceTask;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDocumentProvider_SaveAsOperation;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_ResourceErrorDialogTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_ResourceErrorDialogMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_WizardTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_OpenModelFileDialogTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_CreationPageName;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_CreationPageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_CreationPageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_RootSelectionPageName;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_RootSelectionPageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_RootSelectionPageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_RootSelectionPageSelectionTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_RootSelectionPageNoSelectionMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_InitDiagramCommand;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelNewDiagramFileWizard_IncorrectRootError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditor_SavingDeletedFile;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditor_SaveAsErrorTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditor_SaveAsErrorMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditor_SaveErrorTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelDiagramEditor_SaveErrorMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelElementChooserDialog_SelectModelElementTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ModelElementSelectionPageMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String ValidateActionMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String CompositeUnits1Group_title;

+

+	/**

+	 * @generated

+	 */

+	public static String AtomicUnits2Group_title;

+

+	/**

+	 * @generated

+	 */

+	public static String FilterUnits3Group_title;

+

+	/**

+	 * @generated

+	 */

+	public static String FeatureUnits4Group_title;

+

+	/**

+	 * @generated

+	 */

+	public static String Ports5Group_title;

+

+	/**

+	 * @generated

+	 */

+	public static String Mappings6Group_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnit1CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnit1CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionCheck2CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionCheck2CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnit3CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnit3CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnit4CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnit4CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnit5CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnit5CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnit6CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnit6CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String AtomicUnit1CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String AtomicUnit1CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiFilterUnit1CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiFilterUnit1CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleFilterUnit2CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleFilterUnit2CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiFeatureUnit1CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiFeatureUnit1CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleFeatureUnit2CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleFeatureUnit2CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiInputPort1CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiInputPort1CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiOutputPort2CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiOutputPort2CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleInputPort3CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleInputPort3CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleOutputPort4CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleOutputPort4CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiPortMapping1CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiPortMapping1CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiSinglePortMapping2CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String MultiSinglePortMapping2CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SinglePortMapping3CreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SinglePortMapping3CreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitIfCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitThenCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitElseCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitIfCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitThenCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitElseCompartment2EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitIfCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitThenCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitElseCompartment3EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitIfCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitThenCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitElseCompartment4EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitIfCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitThenCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitElseCompartment5EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitIfCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitThenCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitElseCompartment6EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitIfCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitThenCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConditionalUnitConditionalUnitElseCompartment7EditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CommandName_OpenDiagram;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3017_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3017_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3035_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3035_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3032_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3032_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3013_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3013_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3024_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3024_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiPortMapping_4002_target;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiPortMapping_4002_source;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3020_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3020_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleOutputPort_3018_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SinglePortMapping_4001_target;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SinglePortMapping_4001_source;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3010_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3010_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3023_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3023_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiOutputPort_3015_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleOutputPort_3011_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3005_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3005_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3002_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3002_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3006_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3006_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3031_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3031_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiOutputPort_3021_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_2001_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_2001_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3009_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3009_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_CompositeRefactoring_1000_links;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3027_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3027_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3001_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_SingleInputPort_3001_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3028_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3028_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiSinglePortMapping_4003_target;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiSinglePortMapping_4003_source;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3014_incominglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorGroupName_MultiInputPort_3014_outgoinglinks;

+

+	/**

+	 * @generated

+	 */

+	public static String NavigatorActionProvider_OpenDiagramActionName;

+

+	/**

+	 * @generated

+	 */

+	public static String AbstractParser_UnexpectedValueType;

+

+	/**

+	 * @generated

+	 */

+	public static String AbstractParser_WrongStringConversion;

+

+	/**

+	 * @generated

+	 */

+	public static String AbstractParser_UnknownLiteral;

+

+	/**

+	 * @generated

+	 */

+	public static String MessageFormatParser_InvalidInputError;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelModelingAssistantProviderTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ComrelModelingAssistantProviderMessage;

+

+	//TODO: put accessor fields manually	

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ModelElementSelectionPage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ModelElementSelectionPage.java
new file mode 100644
index 0000000..a805458
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ModelElementSelectionPage.java
@@ -0,0 +1,153 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import org.eclipse.emf.ecore.EObject;

+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.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.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;

+

+/**

+ * Wizard page that allows to select element from model.

+ * @generated

+ */

+public class ModelElementSelectionPage extends WizardPage {

+	/**

+	 * @generated

+	 */

+	protected EObject selectedModelElement;

+

+	/**

+	 * @generated

+	 */

+	private TreeViewer modelViewer;

+

+	/**

+	 * @generated

+	 */

+	public ModelElementSelectionPage(String pageName) {

+		super(pageName);

+	}

+

+	/**

+	 * @generated

+	 */

+	public EObject getModelElement() {

+		return selectedModelElement;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setModelElement(EObject modelElement) {

+		selectedModelElement = modelElement;

+		if (modelViewer != null) {

+			if (selectedModelElement != null) {

+				modelViewer.setInput(selectedModelElement.eResource());

+				modelViewer.setSelection(new StructuredSelection(

+						selectedModelElement));

+			} else {

+				modelViewer.setInput(null);

+			}

+			setPageComplete(validatePage());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void createControl(Composite parent) {

+		initializeDialogUnits(parent);

+

+		Composite plate = new Composite(parent, SWT.NONE);

+		plate.setLayoutData(new GridData(GridData.FILL_BOTH));

+		GridLayout layout = new GridLayout();

+		layout.marginWidth = 0;

+		plate.setLayout(layout);

+		setControl(plate);

+

+		Label label = new Label(plate, SWT.NONE);

+		label.setText(getSelectionTitle());

+		label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));

+

+		modelViewer = new TreeViewer(plate, SWT.SINGLE | SWT.H_SCROLL

+				| SWT.V_SCROLL | SWT.BORDER);

+		GridData layoutData = new GridData(GridData.FILL_BOTH);

+		layoutData.heightHint = 300;

+		layoutData.widthHint = 300;

+		modelViewer.getTree().setLayoutData(layoutData);

+		modelViewer.setContentProvider(new AdapterFactoryContentProvider(

+				ComrelDiagramEditorPlugin.getInstance()

+						.getItemProvidersAdapterFactory()));

+		modelViewer.setLabelProvider(new AdapterFactoryLabelProvider(

+				ComrelDiagramEditorPlugin.getInstance()

+						.getItemProvidersAdapterFactory()));

+		if (selectedModelElement != null) {

+			modelViewer.setInput(selectedModelElement.eResource());

+			modelViewer.setSelection(new StructuredSelection(

+					selectedModelElement));

+		}

+		modelViewer

+				.addSelectionChangedListener(new ISelectionChangedListener() {

+					public void selectionChanged(SelectionChangedEvent event) {

+						ModelElementSelectionPage.this

+								.updateSelection((IStructuredSelection) event

+										.getSelection());

+					}

+				});

+

+		setPageComplete(validatePage());

+	}

+

+	/**

+	 * Override to provide custom model element description.

+	 * @generated

+	 */

+	protected String getSelectionTitle() {

+		return Messages.ModelElementSelectionPageMessage;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateSelection(IStructuredSelection selection) {

+		selectedModelElement = null;

+		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) {

+				selectedModelElement = (EObject) selectedElement;

+			}

+		}

+		setPageComplete(validatePage());

+	}

+

+	/**

+	 * Override to provide specific validation of the selected model element.

+	 * @generated

+	 */

+	protected boolean validatePage() {

+		return true;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ValidateAction.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ValidateAction.java
new file mode 100644
index 0000000..c2b72eb
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/ValidateAction.java
@@ -0,0 +1,300 @@
+/*

+ * 

+ */

+package comrel.diagram.part;

+

+import java.lang.reflect.InvocationTargetException;

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.Diagnostician;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.emf.validation.model.EvaluationMode;

+import org.eclipse.emf.validation.model.IConstraintStatus;

+import org.eclipse.emf.validation.service.IBatchValidator;

+import org.eclipse.emf.validation.service.ModelValidationService;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.operation.IRunnableWithProgress;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;

+

+import comrel.diagram.providers.ComrelMarkerNavigationProvider;

+import comrel.diagram.providers.ComrelValidationProvider;

+

+/**

+ * @generated

+ */

+public class ValidateAction extends Action {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPage page;

+

+	/**

+	 * @generated

+	 */

+	public ValidateAction(IWorkbenchPage page) {

+		setText(Messages.ValidateActionMessage);

+		this.page = page;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void run() {

+		IWorkbenchPart workbenchPart = page.getActivePart();

+		if (workbenchPart instanceof IDiagramWorkbenchPart) {

+			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart;

+			try {

+				new WorkspaceModifyDelegatingOperation(

+						new IRunnableWithProgress() {

+

+							public void run(IProgressMonitor monitor)

+									throws InterruptedException,

+									InvocationTargetException {

+								runValidation(part.getDiagramEditPart(),

+										part.getDiagram());

+							}

+						}).run(new NullProgressMonitor());

+			} catch (Exception e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Validation action failed", e); //$NON-NLS-1$

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runValidation(View view) {

+		try {

+			if (ComrelDiagramEditorUtil.openDiagram(view.eResource())) {

+				IEditorPart editorPart = PlatformUI.getWorkbench()

+						.getActiveWorkbenchWindow().getActivePage()

+						.getActiveEditor();

+				if (editorPart instanceof IDiagramWorkbenchPart) {

+					runValidation(

+							((IDiagramWorkbenchPart) editorPart)

+									.getDiagramEditPart(),

+							view);

+				} else {

+					runNonUIValidation(view);

+				}

+			}

+		} catch (Exception e) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Validation action failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runNonUIValidation(View view) {

+		DiagramEditPart diagramEditPart = OffscreenEditPartFactory

+				.getInstance().createDiagramEditPart(view.getDiagram());

+		runValidation(diagramEditPart, view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runValidation(DiagramEditPart diagramEditPart, View view) {

+		final DiagramEditPart fpart = diagramEditPart;

+		final View fview = view;

+		TransactionalEditingDomain txDomain = TransactionUtil

+				.getEditingDomain(view);

+		ComrelValidationProvider.runWithConstraints(txDomain, new Runnable() {

+

+			public void run() {

+				validate(fpart, fview);

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Diagnostic runEMFValidator(View target) {

+		if (target.isSetElement() && target.getElement() != null) {

+			return new Diagnostician() {

+

+				public String getObjectLabel(EObject eObject) {

+					return EMFCoreUtil.getQualifiedName(eObject, true);

+				}

+			}.validate(target.getElement());

+		}

+		return Diagnostic.OK_INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void validate(DiagramEditPart diagramEditPart, View view) {

+		IFile target = view.eResource() != null ? WorkspaceSynchronizer

+				.getFile(view.eResource()) : null;

+		if (target != null) {

+			ComrelMarkerNavigationProvider.deleteMarkers(target);

+		}

+		Diagnostic diagnostic = runEMFValidator(view);

+		createMarkers(target, diagnostic, diagramEditPart);

+		IBatchValidator validator = (IBatchValidator) ModelValidationService

+				.getInstance().newValidator(EvaluationMode.BATCH);

+		validator.setIncludeLiveConstraints(true);

+		if (view.isSetElement() && view.getElement() != null) {

+			IStatus status = validator.validate(view.getElement());

+			createMarkers(target, status, diagramEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void createMarkers(IFile target, IStatus validationStatus,

+			DiagramEditPart diagramEditPart) {

+		if (validationStatus.isOK()) {

+			return;

+		}

+		final IStatus rootStatus = validationStatus;

+		List allStatuses = new ArrayList();

+		ComrelDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new ComrelDiagramEditorUtil.LazyElement2ViewMap(

+				diagramEditPart.getDiagramView(), collectTargetElements(

+						rootStatus, new HashSet<EObject>(), allStatuses));

+		for (Iterator it = allStatuses.iterator(); it.hasNext();) {

+			IConstraintStatus nextStatus = (IConstraintStatus) it.next();

+			View view = ComrelDiagramEditorUtil.findView(diagramEditPart,

+					nextStatus.getTarget(), element2ViewMap);

+			addMarker(diagramEditPart.getViewer(), target, view.eResource()

+					.getURIFragment(view), EMFCoreUtil.getQualifiedName(

+					nextStatus.getTarget(), true), nextStatus.getMessage(),

+					nextStatus.getSeverity());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void createMarkers(IFile target,

+			Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

+		if (emfValidationStatus.getSeverity() == Diagnostic.OK) {

+			return;

+		}

+		final Diagnostic rootStatus = emfValidationStatus;

+		List allDiagnostics = new ArrayList();

+		ComrelDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new ComrelDiagramEditorUtil.LazyElement2ViewMap(

+				diagramEditPart.getDiagramView(), collectTargetElements(

+						rootStatus, new HashSet<EObject>(), allDiagnostics));

+		for (Iterator it = emfValidationStatus.getChildren().iterator(); it

+				.hasNext();) {

+			Diagnostic nextDiagnostic = (Diagnostic) it.next();

+			List data = nextDiagnostic.getData();

+			if (data != null && !data.isEmpty()

+					&& data.get(0) instanceof EObject) {

+				EObject element = (EObject) data.get(0);

+				View view = ComrelDiagramEditorUtil.findView(diagramEditPart,

+						element, element2ViewMap);

+				addMarker(

+						diagramEditPart.getViewer(),

+						target,

+						view.eResource().getURIFragment(view),

+						EMFCoreUtil.getQualifiedName(element, true),

+						nextDiagnostic.getMessage(),

+						diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void addMarker(EditPartViewer viewer, IFile target,

+			String elementId, String location, String message,

+			int statusSeverity) {

+		if (target == null) {

+			return;

+		}

+		ComrelMarkerNavigationProvider.addMarker(target, elementId, location,

+				message, statusSeverity);

+	}

+

+	/**

+	 * @generated

+	 */

+	private static int diagnosticToStatusSeverity(int diagnosticSeverity) {

+		if (diagnosticSeverity == Diagnostic.OK) {

+			return IStatus.OK;

+		} else if (diagnosticSeverity == Diagnostic.INFO) {

+			return IStatus.INFO;

+		} else if (diagnosticSeverity == Diagnostic.WARNING) {

+			return IStatus.WARNING;

+		} else if (diagnosticSeverity == Diagnostic.ERROR

+				|| diagnosticSeverity == Diagnostic.CANCEL) {

+			return IStatus.ERROR;

+		}

+		return IStatus.INFO;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Set<EObject> collectTargetElements(IStatus status,

+			Set<EObject> targetElementCollector, List allConstraintStatuses) {

+		if (status instanceof IConstraintStatus) {

+			targetElementCollector

+					.add(((IConstraintStatus) status).getTarget());

+			allConstraintStatuses.add(status);

+		}

+		if (status.isMultiStatus()) {

+			IStatus[] children = status.getChildren();

+			for (int i = 0; i < children.length; i++) {

+				collectTargetElements(children[i], targetElementCollector,

+						allConstraintStatuses);

+			}

+		}

+		return targetElementCollector;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Set<EObject> collectTargetElements(Diagnostic diagnostic,

+			Set<EObject> targetElementCollector, List allDiagnostics) {

+		List data = diagnostic.getData();

+		EObject target = null;

+		if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

+			target = (EObject) data.get(0);

+			targetElementCollector.add(target);

+			allDiagnostics.add(diagnostic);

+		}

+		if (diagnostic.getChildren() != null

+				&& !diagnostic.getChildren().isEmpty()) {

+			for (Iterator it = diagnostic.getChildren().iterator(); it

+					.hasNext();) {

+				collectTargetElements((Diagnostic) it.next(),

+						targetElementCollector, allDiagnostics);

+			}

+		}

+		return targetElementCollector;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/ElementTypeWithId.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/ElementTypeWithId.java
new file mode 100644
index 0000000..f2f7dab
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/ElementTypeWithId.java
@@ -0,0 +1,94 @@
+package comrel.diagram.part.custom;

+

+import java.net.URL;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+

+/**

+ * Neues ElementTyp mit dem Attribut refId

+ * @author Gerrit

+ *

+ */

+public class ElementTypeWithId implements IElementType {

+

+	final String refId;

+	final IElementType iElementType;

+	

+	public ElementTypeWithId(String refId, IElementType iElementType){

+		this.refId=refId;

+		this.iElementType=iElementType;

+	}

+	

+	@Override

+	public boolean canEdit(IEditCommandRequest req) {

+		

+		return iElementType.canEdit(req);

+	}

+

+	@Override

+	public IElementType[] getAllSuperTypes() {

+		return iElementType.getAllSuperTypes();

+	}

+

+	@Override

+	public String getDisplayName() {

+		return iElementType.getDisplayName();

+	}

+

+	@Override

+	public EClass getEClass() {

+		return iElementType.getEClass();

+	}

+

+	@Override

+	public ICommand getEditCommand(IEditCommandRequest request) {

+		return iElementType.getEditCommand(request);

+	}

+

+	@Override

+	public IEditHelper getEditHelper() {

+		return iElementType.getEditHelper();

+	}

+

+	@Override

+	public URL getIconURL() {

+		return iElementType.getIconURL();

+	}

+

+	@Override

+	public String getId() {

+		return iElementType.getId();

+	}

+

+	@Override

+	public Object getAdapter(Class adapter) {

+		return iElementType.getAdapter(adapter);

+	}

+

+

+	@Override

+	public boolean equals(Object obj) {

+		return iElementType.equals(obj);

+	}

+

+

+	@Override

+	public int hashCode() {

+		return iElementType.hashCode();

+	}

+

+	@Override

+	public String toString() {

+		return iElementType.toString();

+	}

+

+	public String getRefId(){

+		return this.refId;

+	}

+	

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/ToolEntryComparator.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/ToolEntryComparator.java
new file mode 100644
index 0000000..2693ec8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/ToolEntryComparator.java
@@ -0,0 +1,27 @@
+package comrel.diagram.part.custom;

+

+import java.util.Comparator;

+

+import org.eclipse.gef.palette.ToolEntry;

+

+/**

+ * Comparator zum sortieren von ToolEntrys

+ * @author Gerrit

+ *

+ */

+public class ToolEntryComparator implements Comparator<ToolEntry> {

+

+	@Override

+	public int compare(ToolEntry arg0, ToolEntry arg1) {

+		int result = 0;

+		result = arg0.getLabel().compareTo(arg1.getLabel());

+		if(result == 0) {

+			result = arg0.getDescription().compareTo(arg1.getDescription());

+		}

+		if(result == 0) {

+			result = arg0.getId().compareTo(arg1.getId());

+		}

+		return result;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/UnspecifiedTypeCreationToolWithUnitId.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/UnspecifiedTypeCreationToolWithUnitId.java
new file mode 100644
index 0000000..d4db5d7
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/part/custom/UnspecifiedTypeCreationToolWithUnitId.java
@@ -0,0 +1,37 @@
+package comrel.diagram.part.custom;

+

+import java.util.List;

+

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;

+

+import comrel.diagram.part.ComrelPaletteFactory;

+

+/**

+ * erstellt einen unspezifiziertes CreationTool mit UnitId

+ * @author Gerrit

+ *

+ */

+public class UnspecifiedTypeCreationToolWithUnitId extends UnspecifiedTypeCreationTool {

+

+	String unitId ="";

+	

+	public UnspecifiedTypeCreationToolWithUnitId(List elementTypes, String unitId) {

+		super(elementTypes);

+		this.unitId = unitId;

+	}

+	

+	public String getUnitId(){

+		return this.unitId;

+	}

+	

+	/**

+	 * Erstellt einen Request, fügt ihm vorher noch die UNIT_ID hinzu

+	 */

+	protected Request createTargetRequest() {

+		Request request = super.createTargetRequest();

+		request.getExtendedData().put(ComrelPaletteFactory.UNIT_ID, unitId);

+		return request;

+	}

+	

+}
\ No newline at end of file
diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramAppearancePreferencePage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramAppearancePreferencePage.java
new file mode 100644
index 0000000..ff220e1
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramAppearancePreferencePage.java
@@ -0,0 +1,22 @@
+/*

+ * 

+ */

+package comrel.diagram.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramAppearancePreferencePage extends AppearancePreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramAppearancePreferencePage() {

+		setPreferenceStore(ComrelDiagramEditorPlugin.getInstance()

+				.getPreferenceStore());

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramConnectionsPreferencePage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramConnectionsPreferencePage.java
new file mode 100644
index 0000000..44e632d
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramConnectionsPreferencePage.java
@@ -0,0 +1,22 @@
+/*

+ * 

+ */

+package comrel.diagram.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramConnectionsPreferencePage() {

+		setPreferenceStore(ComrelDiagramEditorPlugin.getInstance()

+				.getPreferenceStore());

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramGeneralPreferencePage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramGeneralPreferencePage.java
new file mode 100644
index 0000000..f120ca9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramGeneralPreferencePage.java
@@ -0,0 +1,22 @@
+/*

+ * 

+ */

+package comrel.diagram.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramGeneralPreferencePage extends DiagramsPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramGeneralPreferencePage() {

+		setPreferenceStore(ComrelDiagramEditorPlugin.getInstance()

+				.getPreferenceStore());

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramPreferenceInitializer.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramPreferenceInitializer.java
new file mode 100644
index 0000000..2c7ff8e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramPreferenceInitializer.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.preferences;

+

+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

+import org.eclipse.jface.preference.IPreferenceStore;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer {

+

+	/**

+	 * @generated

+	 */

+	public void initializeDefaultPreferences() {

+		IPreferenceStore store = getPreferenceStore();

+		DiagramGeneralPreferencePage.initDefaults(store);

+		DiagramAppearancePreferencePage.initDefaults(store);

+		DiagramConnectionsPreferencePage.initDefaults(store);

+		DiagramPrintingPreferencePage.initDefaults(store);

+		DiagramRulersAndGridPreferencePage.initDefaults(store);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IPreferenceStore getPreferenceStore() {

+		return ComrelDiagramEditorPlugin.getInstance().getPreferenceStore();

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramPrintingPreferencePage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramPrintingPreferencePage.java
new file mode 100644
index 0000000..5bbffc2
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramPrintingPreferencePage.java
@@ -0,0 +1,22 @@
+/*

+ * 

+ */

+package comrel.diagram.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramPrintingPreferencePage extends PrintingPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramPrintingPreferencePage() {

+		setPreferenceStore(ComrelDiagramEditorPlugin.getInstance()

+				.getPreferenceStore());

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramRulersAndGridPreferencePage.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramRulersAndGridPreferencePage.java
new file mode 100644
index 0000000..d5b0e9e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/preferences/DiagramRulersAndGridPreferencePage.java
@@ -0,0 +1,22 @@
+/*

+ * 

+ */

+package comrel.diagram.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramRulersAndGridPreferencePage extends RulerGridPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramRulersAndGridPreferencePage() {

+		setPreferenceStore(ComrelDiagramEditorPlugin.getInstance()

+				.getPreferenceStore());

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelEditPartProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelEditPartProvider.java
new file mode 100644
index 0000000..f60e6ff
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelEditPartProvider.java
@@ -0,0 +1,146 @@
+/*

+ * 

+ */

+package comrel.diagram.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 comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.edit.parts.ComrelEditPartFactory;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelEditPartProvider extends AbstractEditPartProvider {

+

+	/**

+	 * @generated

+	 */

+	private EditPartFactory factory;

+

+	/**

+	 * @generated

+	 */

+	private boolean allowCaching;

+

+	/**

+	 * @generated

+	 */

+	private WeakReference cachedPart;

+

+	/**

+	 * @generated

+	 */

+	private WeakReference cachedView;

+

+	/**

+	 * @generated

+	 */

+	public ComrelEditPartProvider() {

+		setFactory(new ComrelEditPartFactory());

+		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 (!CompositeRefactoringEditPart.MODEL_ID

+					.equals(ComrelVisualIDRegistry.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;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelElementTypes.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelElementTypes.java
new file mode 100644
index 0000000..c8b4df9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelElementTypes.java
@@ -0,0 +1,1171 @@
+/*

+ * 

+ */

+package comrel.diagram.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.ecore.EClass;

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.ENamedElement;

+import org.eclipse.emf.ecore.EStructuralFeature;

+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 comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnit2EditPart;

+import comrel.diagram.edit.parts.AtomicUnit3EditPart;

+import comrel.diagram.edit.parts.AtomicUnit4EditPart;

+import comrel.diagram.edit.parts.AtomicUnit5EditPart;

+import comrel.diagram.edit.parts.AtomicUnit6EditPart;

+import comrel.diagram.edit.parts.AtomicUnit7EditPart;

+import comrel.diagram.edit.parts.AtomicUnitEditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitEditPart;

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.edit.parts.ConditionCheckEditPart;

+import comrel.diagram.edit.parts.ConditionalUnit2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnit7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitEditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnit5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitEditPart;

+import comrel.diagram.edit.parts.MultiInputPort2EditPart;

+import comrel.diagram.edit.parts.MultiInputPort3EditPart;

+import comrel.diagram.edit.parts.MultiInputPort4EditPart;

+import comrel.diagram.edit.parts.MultiInputPort5EditPart;

+import comrel.diagram.edit.parts.MultiInputPort6EditPart;

+import comrel.diagram.edit.parts.MultiInputPort7EditPart;

+import comrel.diagram.edit.parts.MultiInputPort8EditPart;

+import comrel.diagram.edit.parts.MultiInputPort9EditPart;

+import comrel.diagram.edit.parts.MultiInputPortEditPart;

+import comrel.diagram.edit.parts.MultiOutputPort2EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortEditPart;

+import comrel.diagram.edit.parts.MultiPortMappingEditPart;

+import comrel.diagram.edit.parts.MultiSinglePortMappingEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitEditPart;

+import comrel.diagram.edit.parts.SequentialUnit2EditPart;

+import comrel.diagram.edit.parts.SequentialUnit3EditPart;

+import comrel.diagram.edit.parts.SequentialUnit4EditPart;

+import comrel.diagram.edit.parts.SequentialUnit5EditPart;

+import comrel.diagram.edit.parts.SequentialUnit6EditPart;

+import comrel.diagram.edit.parts.SequentialUnit7EditPart;

+import comrel.diagram.edit.parts.SequentialUnitEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnit5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitEditPart;

+import comrel.diagram.edit.parts.SingleInputPort2EditPart;

+import comrel.diagram.edit.parts.SingleInputPort3EditPart;

+import comrel.diagram.edit.parts.SingleInputPort4EditPart;

+import comrel.diagram.edit.parts.SingleInputPort5EditPart;

+import comrel.diagram.edit.parts.SingleInputPort6EditPart;

+import comrel.diagram.edit.parts.SingleInputPort7EditPart;

+import comrel.diagram.edit.parts.SingleInputPort8EditPart;

+import comrel.diagram.edit.parts.SingleInputPort9EditPart;

+import comrel.diagram.edit.parts.SingleInputPortEditPart;

+import comrel.diagram.edit.parts.SingleOutputPort2EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortEditPart;

+import comrel.diagram.edit.parts.SinglePortMappingEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnit7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitEditPart;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class ComrelElementTypes {

+

+	/**

+	 * @generated

+	 */

+	private ComrelElementTypes() {

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Map<IElementType, ENamedElement> elements;

+

+	/**

+	 * @generated

+	 */

+	private static ImageRegistry imageRegistry;

+

+	/**

+	 * @generated

+	 */

+	private static Set<IElementType> KNOWN_ELEMENT_TYPES;

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType CompositeRefactoring_1000 = getElementType("comrel.diagram.CompositeRefactoring_1000"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_2001 = getElementType("comrel.diagram.SingleInputPort_2001"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType CartesianQueuedUnit_2002 = getElementType("comrel.diagram.CartesianQueuedUnit_2002"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ParallelQueuedUnit_2003 = getElementType("comrel.diagram.ParallelQueuedUnit_2003"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleQueuedUnit_2004 = getElementType("comrel.diagram.SingleQueuedUnit_2004"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SequentialUnit_2005 = getElementType("comrel.diagram.SequentialUnit_2005"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionalUnit_2006 = getElementType("comrel.diagram.ConditionalUnit_2006"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType AtomicUnit_2007 = getElementType("comrel.diagram.AtomicUnit_2007"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3001 = getElementType("comrel.diagram.SingleInputPort_3001"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3002 = getElementType("comrel.diagram.MultiInputPort_3002"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType CartesianQueuedUnit_3003 = getElementType("comrel.diagram.CartesianQueuedUnit_3003"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ParallelQueuedUnit_3004 = getElementType("comrel.diagram.ParallelQueuedUnit_3004"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3005 = getElementType("comrel.diagram.SingleInputPort_3005"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3006 = getElementType("comrel.diagram.MultiInputPort_3006"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType CartesianQueuedUnit_3007 = getElementType("comrel.diagram.CartesianQueuedUnit_3007"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFeatureUnit_3008 = getElementType("comrel.diagram.SingleFeatureUnit_3008"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3009 = getElementType("comrel.diagram.SingleInputPort_3009"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3010 = getElementType("comrel.diagram.MultiInputPort_3010"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleOutputPort_3011 = getElementType("comrel.diagram.SingleOutputPort_3011"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFeatureUnit_3012 = getElementType("comrel.diagram.MultiFeatureUnit_3012"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3013 = getElementType("comrel.diagram.SingleInputPort_3013"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3014 = getElementType("comrel.diagram.MultiInputPort_3014"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiOutputPort_3015 = getElementType("comrel.diagram.MultiOutputPort_3015"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFilterUnit_3016 = getElementType("comrel.diagram.SingleFilterUnit_3016"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3017 = getElementType("comrel.diagram.MultiInputPort_3017"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleOutputPort_3018 = getElementType("comrel.diagram.SingleOutputPort_3018"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFilterUnit_3019 = getElementType("comrel.diagram.MultiFilterUnit_3019"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3020 = getElementType("comrel.diagram.MultiInputPort_3020"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiOutputPort_3021 = getElementType("comrel.diagram.MultiOutputPort_3021"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleQueuedUnit_3022 = getElementType("comrel.diagram.SingleQueuedUnit_3022"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3023 = getElementType("comrel.diagram.SingleInputPort_3023"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3024 = getElementType("comrel.diagram.MultiInputPort_3024"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType CartesianQueuedUnit_3025 = getElementType("comrel.diagram.CartesianQueuedUnit_3025"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SequentialUnit_3026 = getElementType("comrel.diagram.SequentialUnit_3026"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3027 = getElementType("comrel.diagram.SingleInputPort_3027"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3028 = getElementType("comrel.diagram.MultiInputPort_3028"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType CartesianQueuedUnit_3029 = getElementType("comrel.diagram.CartesianQueuedUnit_3029"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionalUnit_3030 = getElementType("comrel.diagram.ConditionalUnit_3030"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3031 = getElementType("comrel.diagram.SingleInputPort_3031"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiInputPort_3032 = getElementType("comrel.diagram.MultiInputPort_3032"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType CartesianQueuedUnit_3033 = getElementType("comrel.diagram.CartesianQueuedUnit_3033"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType AtomicUnit_3034 = getElementType("comrel.diagram.AtomicUnit_3034"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleInputPort_3035 = getElementType("comrel.diagram.SingleInputPort_3035"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ParallelQueuedUnit_3036 = getElementType("comrel.diagram.ParallelQueuedUnit_3036"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ParallelQueuedUnit_3037 = getElementType("comrel.diagram.ParallelQueuedUnit_3037"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFeatureUnit_3038 = getElementType("comrel.diagram.SingleFeatureUnit_3038"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFeatureUnit_3039 = getElementType("comrel.diagram.MultiFeatureUnit_3039"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFilterUnit_3040 = getElementType("comrel.diagram.SingleFilterUnit_3040"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFilterUnit_3041 = getElementType("comrel.diagram.MultiFilterUnit_3041"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleQueuedUnit_3042 = getElementType("comrel.diagram.SingleQueuedUnit_3042"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ParallelQueuedUnit_3043 = getElementType("comrel.diagram.ParallelQueuedUnit_3043"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SequentialUnit_3044 = getElementType("comrel.diagram.SequentialUnit_3044"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ParallelQueuedUnit_3045 = getElementType("comrel.diagram.ParallelQueuedUnit_3045"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionalUnit_3046 = getElementType("comrel.diagram.ConditionalUnit_3046"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType CartesianQueuedUnit_3047 = getElementType("comrel.diagram.CartesianQueuedUnit_3047"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ParallelQueuedUnit_3048 = getElementType("comrel.diagram.ParallelQueuedUnit_3048"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType AtomicUnit_3049 = getElementType("comrel.diagram.AtomicUnit_3049"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFeatureUnit_3050 = getElementType("comrel.diagram.SingleFeatureUnit_3050"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFeatureUnit_3051 = getElementType("comrel.diagram.MultiFeatureUnit_3051"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFilterUnit_3052 = getElementType("comrel.diagram.SingleFilterUnit_3052"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFilterUnit_3053 = getElementType("comrel.diagram.MultiFilterUnit_3053"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleQueuedUnit_3054 = getElementType("comrel.diagram.SingleQueuedUnit_3054"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFeatureUnit_3055 = getElementType("comrel.diagram.SingleFeatureUnit_3055"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFeatureUnit_3056 = getElementType("comrel.diagram.MultiFeatureUnit_3056"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFilterUnit_3057 = getElementType("comrel.diagram.SingleFilterUnit_3057"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFilterUnit_3058 = getElementType("comrel.diagram.MultiFilterUnit_3058"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleQueuedUnit_3059 = getElementType("comrel.diagram.SingleQueuedUnit_3059"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SequentialUnit_3060 = getElementType("comrel.diagram.SequentialUnit_3060"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFeatureUnit_3061 = getElementType("comrel.diagram.SingleFeatureUnit_3061"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFeatureUnit_3062 = getElementType("comrel.diagram.MultiFeatureUnit_3062"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleFilterUnit_3063 = getElementType("comrel.diagram.SingleFilterUnit_3063"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiFilterUnit_3064 = getElementType("comrel.diagram.MultiFilterUnit_3064"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleQueuedUnit_3065 = getElementType("comrel.diagram.SingleQueuedUnit_3065"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionalUnit_3066 = getElementType("comrel.diagram.ConditionalUnit_3066"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SingleQueuedUnit_3067 = getElementType("comrel.diagram.SingleQueuedUnit_3067"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType AtomicUnit_3068 = getElementType("comrel.diagram.AtomicUnit_3068"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SequentialUnit_3069 = getElementType("comrel.diagram.SequentialUnit_3069"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SequentialUnit_3070 = getElementType("comrel.diagram.SequentialUnit_3070"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionalUnit_3071 = getElementType("comrel.diagram.ConditionalUnit_3071"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionalUnit_3072 = getElementType("comrel.diagram.ConditionalUnit_3072"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SequentialUnit_3073 = getElementType("comrel.diagram.SequentialUnit_3073"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType AtomicUnit_3074 = getElementType("comrel.diagram.AtomicUnit_3074"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionalUnit_3075 = getElementType("comrel.diagram.ConditionalUnit_3075"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConditionCheck_3076 = getElementType("comrel.diagram.ConditionCheck_3076"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType AtomicUnit_3077 = getElementType("comrel.diagram.AtomicUnit_3077"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType AtomicUnit_3078 = getElementType("comrel.diagram.AtomicUnit_3078"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType SinglePortMapping_4001 = getElementType("comrel.diagram.SinglePortMapping_4001"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiPortMapping_4002 = getElementType("comrel.diagram.MultiPortMapping_4002"); //$NON-NLS-1$

+	/**

+	 * @generated

+	 */

+	public static final IElementType MultiSinglePortMapping_4003 = getElementType("comrel.diagram.MultiSinglePortMapping_4003"); //$NON-NLS-1$

+

+	/**

+	 * @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) {

+			EStructuralFeature feature = ((EStructuralFeature) element);

+			EClass eContainingClass = feature.getEContainingClass();

+			EClassifier eType = feature.getEType();

+			if (eContainingClass != null && !eContainingClass.isAbstract()) {

+				element = eContainingClass;

+			} else if (eType instanceof EClass

+					&& !((EClass) eType).isAbstract()) {

+				element = eType;

+			}

+		}

+		if (element instanceof EClass) {

+			EClass eClass = (EClass) element;

+			if (!eClass.isAbstract()) {

+				return ComrelDiagramEditorPlugin.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<IElementType, ENamedElement>();

+

+			elements.put(CompositeRefactoring_1000,

+					ComrelPackage.eINSTANCE.getCompositeRefactoring());

+

+			elements.put(SingleInputPort_2001,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(CartesianQueuedUnit_2002,

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit());

+

+			elements.put(ParallelQueuedUnit_2003,

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit());

+

+			elements.put(SingleQueuedUnit_2004,

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit());

+

+			elements.put(SequentialUnit_2005,

+					ComrelPackage.eINSTANCE.getSequentialUnit());

+

+			elements.put(ConditionalUnit_2006,

+					ComrelPackage.eINSTANCE.getConditionalUnit());

+

+			elements.put(AtomicUnit_2007,

+					ComrelPackage.eINSTANCE.getAtomicUnit());

+

+			elements.put(SingleInputPort_3001,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(MultiInputPort_3002,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(CartesianQueuedUnit_3003,

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit());

+

+			elements.put(ParallelQueuedUnit_3004,

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit());

+

+			elements.put(SingleInputPort_3005,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(MultiInputPort_3006,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(CartesianQueuedUnit_3007,

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit());

+

+			elements.put(SingleFeatureUnit_3008,

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit());

+

+			elements.put(SingleInputPort_3009,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(MultiInputPort_3010,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(SingleOutputPort_3011,

+					ComrelPackage.eINSTANCE.getSingleOutputPort());

+

+			elements.put(MultiFeatureUnit_3012,

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit());

+

+			elements.put(SingleInputPort_3013,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(MultiInputPort_3014,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(MultiOutputPort_3015,

+					ComrelPackage.eINSTANCE.getMultiOutputPort());

+

+			elements.put(SingleFilterUnit_3016,

+					ComrelPackage.eINSTANCE.getSingleFilterUnit());

+

+			elements.put(MultiInputPort_3017,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(SingleOutputPort_3018,

+					ComrelPackage.eINSTANCE.getSingleOutputPort());

+

+			elements.put(MultiFilterUnit_3019,

+					ComrelPackage.eINSTANCE.getMultiFilterUnit());

+

+			elements.put(MultiInputPort_3020,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(MultiOutputPort_3021,

+					ComrelPackage.eINSTANCE.getMultiOutputPort());

+

+			elements.put(SingleQueuedUnit_3022,

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit());

+

+			elements.put(SingleInputPort_3023,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(MultiInputPort_3024,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(CartesianQueuedUnit_3025,

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit());

+

+			elements.put(SequentialUnit_3026,

+					ComrelPackage.eINSTANCE.getSequentialUnit());

+

+			elements.put(SingleInputPort_3027,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(MultiInputPort_3028,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(CartesianQueuedUnit_3029,

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit());

+

+			elements.put(ConditionalUnit_3030,

+					ComrelPackage.eINSTANCE.getConditionalUnit());

+

+			elements.put(SingleInputPort_3031,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(MultiInputPort_3032,

+					ComrelPackage.eINSTANCE.getMultiInputPort());

+

+			elements.put(CartesianQueuedUnit_3033,

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit());

+

+			elements.put(AtomicUnit_3034,

+					ComrelPackage.eINSTANCE.getAtomicUnit());

+

+			elements.put(SingleInputPort_3035,

+					ComrelPackage.eINSTANCE.getSingleInputPort());

+

+			elements.put(ParallelQueuedUnit_3036,

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit());

+

+			elements.put(ParallelQueuedUnit_3037,

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit());

+

+			elements.put(SingleFeatureUnit_3038,

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit());

+

+			elements.put(MultiFeatureUnit_3039,

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit());

+

+			elements.put(SingleFilterUnit_3040,

+					ComrelPackage.eINSTANCE.getSingleFilterUnit());

+

+			elements.put(MultiFilterUnit_3041,

+					ComrelPackage.eINSTANCE.getMultiFilterUnit());

+

+			elements.put(SingleQueuedUnit_3042,

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit());

+

+			elements.put(ParallelQueuedUnit_3043,

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit());

+

+			elements.put(SequentialUnit_3044,

+					ComrelPackage.eINSTANCE.getSequentialUnit());

+

+			elements.put(ParallelQueuedUnit_3045,

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit());

+

+			elements.put(ConditionalUnit_3046,

+					ComrelPackage.eINSTANCE.getConditionalUnit());

+

+			elements.put(CartesianQueuedUnit_3047,

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit());

+

+			elements.put(ParallelQueuedUnit_3048,

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit());

+

+			elements.put(AtomicUnit_3049,

+					ComrelPackage.eINSTANCE.getAtomicUnit());

+

+			elements.put(SingleFeatureUnit_3050,

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit());

+

+			elements.put(MultiFeatureUnit_3051,

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit());

+

+			elements.put(SingleFilterUnit_3052,

+					ComrelPackage.eINSTANCE.getSingleFilterUnit());

+

+			elements.put(MultiFilterUnit_3053,

+					ComrelPackage.eINSTANCE.getMultiFilterUnit());

+

+			elements.put(SingleQueuedUnit_3054,

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit());

+

+			elements.put(SingleFeatureUnit_3055,

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit());

+

+			elements.put(MultiFeatureUnit_3056,

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit());

+

+			elements.put(SingleFilterUnit_3057,

+					ComrelPackage.eINSTANCE.getSingleFilterUnit());

+

+			elements.put(MultiFilterUnit_3058,

+					ComrelPackage.eINSTANCE.getMultiFilterUnit());

+

+			elements.put(SingleQueuedUnit_3059,

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit());

+

+			elements.put(SequentialUnit_3060,

+					ComrelPackage.eINSTANCE.getSequentialUnit());

+

+			elements.put(SingleFeatureUnit_3061,

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit());

+

+			elements.put(MultiFeatureUnit_3062,

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit());

+

+			elements.put(SingleFilterUnit_3063,

+					ComrelPackage.eINSTANCE.getSingleFilterUnit());

+

+			elements.put(MultiFilterUnit_3064,

+					ComrelPackage.eINSTANCE.getMultiFilterUnit());

+

+			elements.put(SingleQueuedUnit_3065,

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit());

+

+			elements.put(ConditionalUnit_3066,

+					ComrelPackage.eINSTANCE.getConditionalUnit());

+

+			elements.put(SingleQueuedUnit_3067,

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit());

+

+			elements.put(AtomicUnit_3068,

+					ComrelPackage.eINSTANCE.getAtomicUnit());

+

+			elements.put(SequentialUnit_3069,

+					ComrelPackage.eINSTANCE.getSequentialUnit());

+

+			elements.put(SequentialUnit_3070,

+					ComrelPackage.eINSTANCE.getSequentialUnit());

+

+			elements.put(ConditionalUnit_3071,

+					ComrelPackage.eINSTANCE.getConditionalUnit());

+

+			elements.put(ConditionalUnit_3072,

+					ComrelPackage.eINSTANCE.getConditionalUnit());

+

+			elements.put(SequentialUnit_3073,

+					ComrelPackage.eINSTANCE.getSequentialUnit());

+

+			elements.put(AtomicUnit_3074,

+					ComrelPackage.eINSTANCE.getAtomicUnit());

+

+			elements.put(ConditionalUnit_3075,

+					ComrelPackage.eINSTANCE.getConditionalUnit());

+

+			elements.put(ConditionCheck_3076,

+					ComrelPackage.eINSTANCE.getConditionCheck());

+

+			elements.put(AtomicUnit_3077,

+					ComrelPackage.eINSTANCE.getAtomicUnit());

+

+			elements.put(AtomicUnit_3078,

+					ComrelPackage.eINSTANCE.getAtomicUnit());

+

+			elements.put(SinglePortMapping_4001,

+					ComrelPackage.eINSTANCE.getSinglePortMapping());

+

+			elements.put(MultiPortMapping_4002,

+					ComrelPackage.eINSTANCE.getMultiPortMapping());

+

+			elements.put(MultiSinglePortMapping_4003,

+					ComrelPackage.eINSTANCE.getMultiSinglePortMapping());

+		}

+		return (ENamedElement) elements.get(type);

+	}

+

+	/**

+	 * @generated

+	 */

+	private static IElementType getElementType(String id) {

+		return ElementTypeRegistry.getInstance().getType(id);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean isKnownElementType(IElementType elementType) {

+		if (KNOWN_ELEMENT_TYPES == null) {

+			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();

+			KNOWN_ELEMENT_TYPES.add(CompositeRefactoring_1000);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_2001);

+			KNOWN_ELEMENT_TYPES.add(CartesianQueuedUnit_2002);

+			KNOWN_ELEMENT_TYPES.add(ParallelQueuedUnit_2003);

+			KNOWN_ELEMENT_TYPES.add(SingleQueuedUnit_2004);

+			KNOWN_ELEMENT_TYPES.add(SequentialUnit_2005);

+			KNOWN_ELEMENT_TYPES.add(ConditionalUnit_2006);

+			KNOWN_ELEMENT_TYPES.add(AtomicUnit_2007);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3001);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3002);

+			KNOWN_ELEMENT_TYPES.add(CartesianQueuedUnit_3003);

+			KNOWN_ELEMENT_TYPES.add(ParallelQueuedUnit_3004);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3005);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3006);

+			KNOWN_ELEMENT_TYPES.add(CartesianQueuedUnit_3007);

+			KNOWN_ELEMENT_TYPES.add(SingleFeatureUnit_3008);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3009);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3010);

+			KNOWN_ELEMENT_TYPES.add(SingleOutputPort_3011);

+			KNOWN_ELEMENT_TYPES.add(MultiFeatureUnit_3012);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3013);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3014);

+			KNOWN_ELEMENT_TYPES.add(MultiOutputPort_3015);

+			KNOWN_ELEMENT_TYPES.add(SingleFilterUnit_3016);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3017);

+			KNOWN_ELEMENT_TYPES.add(SingleOutputPort_3018);

+			KNOWN_ELEMENT_TYPES.add(MultiFilterUnit_3019);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3020);

+			KNOWN_ELEMENT_TYPES.add(MultiOutputPort_3021);

+			KNOWN_ELEMENT_TYPES.add(SingleQueuedUnit_3022);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3023);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3024);

+			KNOWN_ELEMENT_TYPES.add(CartesianQueuedUnit_3025);

+			KNOWN_ELEMENT_TYPES.add(SequentialUnit_3026);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3027);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3028);

+			KNOWN_ELEMENT_TYPES.add(CartesianQueuedUnit_3029);

+			KNOWN_ELEMENT_TYPES.add(ConditionalUnit_3030);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3031);

+			KNOWN_ELEMENT_TYPES.add(MultiInputPort_3032);

+			KNOWN_ELEMENT_TYPES.add(CartesianQueuedUnit_3033);

+			KNOWN_ELEMENT_TYPES.add(AtomicUnit_3034);

+			KNOWN_ELEMENT_TYPES.add(SingleInputPort_3035);

+			KNOWN_ELEMENT_TYPES.add(ParallelQueuedUnit_3036);

+			KNOWN_ELEMENT_TYPES.add(ParallelQueuedUnit_3037);

+			KNOWN_ELEMENT_TYPES.add(SingleFeatureUnit_3038);

+			KNOWN_ELEMENT_TYPES.add(MultiFeatureUnit_3039);

+			KNOWN_ELEMENT_TYPES.add(SingleFilterUnit_3040);

+			KNOWN_ELEMENT_TYPES.add(MultiFilterUnit_3041);

+			KNOWN_ELEMENT_TYPES.add(SingleQueuedUnit_3042);

+			KNOWN_ELEMENT_TYPES.add(ParallelQueuedUnit_3043);

+			KNOWN_ELEMENT_TYPES.add(SequentialUnit_3044);

+			KNOWN_ELEMENT_TYPES.add(ParallelQueuedUnit_3045);

+			KNOWN_ELEMENT_TYPES.add(ConditionalUnit_3046);

+			KNOWN_ELEMENT_TYPES.add(CartesianQueuedUnit_3047);

+			KNOWN_ELEMENT_TYPES.add(ParallelQueuedUnit_3048);

+			KNOWN_ELEMENT_TYPES.add(AtomicUnit_3049);

+			KNOWN_ELEMENT_TYPES.add(SingleFeatureUnit_3050);

+			KNOWN_ELEMENT_TYPES.add(MultiFeatureUnit_3051);

+			KNOWN_ELEMENT_TYPES.add(SingleFilterUnit_3052);

+			KNOWN_ELEMENT_TYPES.add(MultiFilterUnit_3053);

+			KNOWN_ELEMENT_TYPES.add(SingleQueuedUnit_3054);

+			KNOWN_ELEMENT_TYPES.add(SingleFeatureUnit_3055);

+			KNOWN_ELEMENT_TYPES.add(MultiFeatureUnit_3056);

+			KNOWN_ELEMENT_TYPES.add(SingleFilterUnit_3057);

+			KNOWN_ELEMENT_TYPES.add(MultiFilterUnit_3058);

+			KNOWN_ELEMENT_TYPES.add(SingleQueuedUnit_3059);

+			KNOWN_ELEMENT_TYPES.add(SequentialUnit_3060);

+			KNOWN_ELEMENT_TYPES.add(SingleFeatureUnit_3061);

+			KNOWN_ELEMENT_TYPES.add(MultiFeatureUnit_3062);

+			KNOWN_ELEMENT_TYPES.add(SingleFilterUnit_3063);

+			KNOWN_ELEMENT_TYPES.add(MultiFilterUnit_3064);

+			KNOWN_ELEMENT_TYPES.add(SingleQueuedUnit_3065);

+			KNOWN_ELEMENT_TYPES.add(ConditionalUnit_3066);

+			KNOWN_ELEMENT_TYPES.add(SingleQueuedUnit_3067);

+			KNOWN_ELEMENT_TYPES.add(AtomicUnit_3068);

+			KNOWN_ELEMENT_TYPES.add(SequentialUnit_3069);

+			KNOWN_ELEMENT_TYPES.add(SequentialUnit_3070);

+			KNOWN_ELEMENT_TYPES.add(ConditionalUnit_3071);

+			KNOWN_ELEMENT_TYPES.add(ConditionalUnit_3072);

+			KNOWN_ELEMENT_TYPES.add(SequentialUnit_3073);

+			KNOWN_ELEMENT_TYPES.add(AtomicUnit_3074);

+			KNOWN_ELEMENT_TYPES.add(ConditionalUnit_3075);

+			KNOWN_ELEMENT_TYPES.add(ConditionCheck_3076);

+			KNOWN_ELEMENT_TYPES.add(AtomicUnit_3077);

+			KNOWN_ELEMENT_TYPES.add(AtomicUnit_3078);

+			KNOWN_ELEMENT_TYPES.add(SinglePortMapping_4001);

+			KNOWN_ELEMENT_TYPES.add(MultiPortMapping_4002);

+			KNOWN_ELEMENT_TYPES.add(MultiSinglePortMapping_4003);

+		}

+		return KNOWN_ELEMENT_TYPES.contains(elementType);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static IElementType getElementType(int visualID) {

+		switch (visualID) {

+		case CompositeRefactoringEditPart.VISUAL_ID:

+			return CompositeRefactoring_1000;

+		case SingleInputPortEditPart.VISUAL_ID:

+			return SingleInputPort_2001;

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return CartesianQueuedUnit_2002;

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return ParallelQueuedUnit_2003;

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return SingleQueuedUnit_2004;

+		case SequentialUnitEditPart.VISUAL_ID:

+			return SequentialUnit_2005;

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return ConditionalUnit_2006;

+		case AtomicUnitEditPart.VISUAL_ID:

+			return AtomicUnit_2007;

+		case SingleInputPort2EditPart.VISUAL_ID:

+			return SingleInputPort_3001;

+		case MultiInputPortEditPart.VISUAL_ID:

+			return MultiInputPort_3002;

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return CartesianQueuedUnit_3003;

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return ParallelQueuedUnit_3004;

+		case SingleInputPort3EditPart.VISUAL_ID:

+			return SingleInputPort_3005;

+		case MultiInputPort2EditPart.VISUAL_ID:

+			return MultiInputPort_3006;

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return CartesianQueuedUnit_3007;

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return SingleFeatureUnit_3008;

+		case SingleInputPort4EditPart.VISUAL_ID:

+			return SingleInputPort_3009;

+		case MultiInputPort3EditPart.VISUAL_ID:

+			return MultiInputPort_3010;

+		case SingleOutputPortEditPart.VISUAL_ID:

+			return SingleOutputPort_3011;

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return MultiFeatureUnit_3012;

+		case SingleInputPort5EditPart.VISUAL_ID:

+			return SingleInputPort_3013;

+		case MultiInputPort4EditPart.VISUAL_ID:

+			return MultiInputPort_3014;

+		case MultiOutputPortEditPart.VISUAL_ID:

+			return MultiOutputPort_3015;

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return SingleFilterUnit_3016;

+		case MultiInputPort5EditPart.VISUAL_ID:

+			return MultiInputPort_3017;

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			return SingleOutputPort_3018;

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return MultiFilterUnit_3019;

+		case MultiInputPort6EditPart.VISUAL_ID:

+			return MultiInputPort_3020;

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			return MultiOutputPort_3021;

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return SingleQueuedUnit_3022;

+		case SingleInputPort6EditPart.VISUAL_ID:

+			return SingleInputPort_3023;

+		case MultiInputPort7EditPart.VISUAL_ID:

+			return MultiInputPort_3024;

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return CartesianQueuedUnit_3025;

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return SequentialUnit_3026;

+		case SingleInputPort7EditPart.VISUAL_ID:

+			return SingleInputPort_3027;

+		case MultiInputPort8EditPart.VISUAL_ID:

+			return MultiInputPort_3028;

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return CartesianQueuedUnit_3029;

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return ConditionalUnit_3030;

+		case SingleInputPort8EditPart.VISUAL_ID:

+			return SingleInputPort_3031;

+		case MultiInputPort9EditPart.VISUAL_ID:

+			return MultiInputPort_3032;

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return CartesianQueuedUnit_3033;

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return AtomicUnit_3034;

+		case SingleInputPort9EditPart.VISUAL_ID:

+			return SingleInputPort_3035;

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return ParallelQueuedUnit_3036;

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return ParallelQueuedUnit_3037;

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return SingleFeatureUnit_3038;

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return MultiFeatureUnit_3039;

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return SingleFilterUnit_3040;

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return MultiFilterUnit_3041;

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return SingleQueuedUnit_3042;

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return ParallelQueuedUnit_3043;

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return SequentialUnit_3044;

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return ParallelQueuedUnit_3045;

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return ConditionalUnit_3046;

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return CartesianQueuedUnit_3047;

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return ParallelQueuedUnit_3048;

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return AtomicUnit_3049;

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return SingleFeatureUnit_3050;

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return MultiFeatureUnit_3051;

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return SingleFilterUnit_3052;

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return MultiFilterUnit_3053;

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return SingleQueuedUnit_3054;

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return SingleFeatureUnit_3055;

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return MultiFeatureUnit_3056;

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return SingleFilterUnit_3057;

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return MultiFilterUnit_3058;

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return SingleQueuedUnit_3059;

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return SequentialUnit_3060;

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return SingleFeatureUnit_3061;

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return MultiFeatureUnit_3062;

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return SingleFilterUnit_3063;

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return MultiFilterUnit_3064;

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return SingleQueuedUnit_3065;

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return ConditionalUnit_3066;

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return SingleQueuedUnit_3067;

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return AtomicUnit_3068;

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return SequentialUnit_3069;

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return SequentialUnit_3070;

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return ConditionalUnit_3071;

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return ConditionalUnit_3072;

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return SequentialUnit_3073;

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return AtomicUnit_3074;

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return ConditionalUnit_3075;

+		case ConditionCheckEditPart.VISUAL_ID:

+			return ConditionCheck_3076;

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return AtomicUnit_3077;

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return AtomicUnit_3078;

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return SinglePortMapping_4001;

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return MultiPortMapping_4002;

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return MultiSinglePortMapping_4003;

+		}

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelIconProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelIconProvider.java
new file mode 100644
index 0000000..97ed640
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelIconProvider.java
@@ -0,0 +1,35 @@
+/*

+ * 

+ */

+package comrel.diagram.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 ComrelIconProvider extends AbstractProvider implements

+		IIconProvider {

+

+	/**

+	 * @generated

+	 */

+	public Image getIcon(IAdaptable hint, int flags) {

+		return ComrelElementTypes.getImage(hint);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean provides(IOperation operation) {

+		if (operation instanceof GetIconOperation) {

+			return ((GetIconOperation) operation).execute(this) != null;

+		}

+		return false;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelMarkerNavigationProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelMarkerNavigationProvider.java
new file mode 100644
index 0000000..49ce2cf
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelMarkerNavigationProvider.java
@@ -0,0 +1,99 @@
+/*

+ * 

+ */

+package comrel.diagram.providers;

+

+import java.util.Arrays;

+import java.util.Map;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

+import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelDiagramEditorUtil;

+

+/**

+ * @generated

+ */

+public class ComrelMarkerNavigationProvider extends

+		AbstractModelMarkerNavigationProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String MARKER_TYPE = ComrelDiagramEditorPlugin.ID

+			+ ".diagnostic"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	protected void doGotoMarker(IMarker marker) {

+		String elementId = marker

+				.getAttribute(

+						org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID,

+						null);

+		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {

+			return;

+		}

+		DiagramEditor editor = (DiagramEditor) getEditor();

+		Map editPartRegistry = editor.getDiagramGraphicalViewer()

+				.getEditPartRegistry();

+		EObject targetView = editor.getDiagram().eResource()

+				.getEObject(elementId);

+		if (targetView == null) {

+			return;

+		}

+		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);

+		if (targetEditPart != null) {

+			ComrelDiagramEditorUtil.selectElementsInDiagram(editor,

+					Arrays.asList(new EditPart[] { targetEditPart }));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void deleteMarkers(IResource resource) {

+		try {

+			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);

+		} catch (CoreException e) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Failed to delete validation markers", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static IMarker addMarker(IFile file, String elementId,

+			String location, String message, int statusSeverity) {

+		IMarker marker = null;

+		try {

+			marker = file.createMarker(MARKER_TYPE);

+			marker.setAttribute(IMarker.MESSAGE, message);

+			marker.setAttribute(IMarker.LOCATION, location);

+			marker.setAttribute(

+					org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID,

+					elementId);

+			int markerSeverity = IMarker.SEVERITY_INFO;

+			if (statusSeverity == IStatus.WARNING) {

+				markerSeverity = IMarker.SEVERITY_WARNING;

+			} else if (statusSeverity == IStatus.ERROR

+					|| statusSeverity == IStatus.CANCEL) {

+				markerSeverity = IMarker.SEVERITY_ERROR;

+			}

+			marker.setAttribute(IMarker.SEVERITY, markerSeverity);

+		} catch (CoreException e) {

+			ComrelDiagramEditorPlugin.getInstance().logError(

+					"Failed to create validation marker", e); //$NON-NLS-1$

+		}

+		return marker;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelModelingAssistantProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelModelingAssistantProvider.java
new file mode 100644
index 0000000..074a823
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelModelingAssistantProvider.java
@@ -0,0 +1,1699 @@
+/*

+ * 

+ */

+package comrel.diagram.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.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;

+

+import comrel.diagram.edit.parts.*;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComrelModelingAssistantProvider extends ModelingAssistantProvider {

+

+	/**

+	 * @generated

+	 */

+	public List getTypesForPopupBar(IAdaptable host) {

+		IGraphicalEditPart editPart = (IGraphicalEditPart) host

+				.getAdapter(IGraphicalEditPart.class);

+		if (editPart instanceof CompositeRefactoringEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(7);

+			types.add(ComrelElementTypes.SingleInputPort_2001);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_2002);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_2003);

+			types.add(ComrelElementTypes.SingleQueuedUnit_2004);

+			types.add(ComrelElementTypes.SequentialUnit_2005);

+			types.add(ComrelElementTypes.ConditionalUnit_2006);

+			types.add(ComrelElementTypes.AtomicUnit_2007);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+			return types;

+		}

+		if (editPart instanceof AtomicUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			return types;

+		}

+		if (editPart instanceof SingleFeatureUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			return types;

+		}

+		if (editPart instanceof MultiFeatureUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			return types;

+		}

+		if (editPart instanceof SingleFilterUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			return types;

+		}

+		if (editPart instanceof MultiFilterUnitEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			return types;

+		}

+		if (editPart instanceof SequentialUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnit6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			return types;

+		}

+		if (editPart instanceof AtomicUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			return types;

+		}

+		if (editPart instanceof SingleFeatureUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			return types;

+		}

+		if (editPart instanceof MultiFeatureUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			return types;

+		}

+		if (editPart instanceof SingleFilterUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			return types;

+		}

+		if (editPart instanceof MultiFilterUnit2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			return types;

+		}

+		if (editPart instanceof SequentialUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnit6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnit7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3001);

+			types.add(ComrelElementTypes.MultiInputPort_3002);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnit7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3005);

+			types.add(ComrelElementTypes.MultiInputPort_3006);

+			return types;

+		}

+		if (editPart instanceof AtomicUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+			return types;

+		}

+		if (editPart instanceof SingleFeatureUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			return types;

+		}

+		if (editPart instanceof MultiFeatureUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			return types;

+		}

+		if (editPart instanceof SingleFilterUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			return types;

+		}

+		if (editPart instanceof MultiFilterUnit3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			return types;

+		}

+		if (editPart instanceof SingleFeatureUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			return types;

+		}

+		if (editPart instanceof MultiFeatureUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			return types;

+		}

+		if (editPart instanceof SingleFilterUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			return types;

+		}

+		if (editPart instanceof MultiFilterUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			return types;

+		}

+		if (editPart instanceof SequentialUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			return types;

+		}

+		if (editPart instanceof SingleFeatureUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3009);

+			types.add(ComrelElementTypes.MultiInputPort_3010);

+			types.add(ComrelElementTypes.SingleOutputPort_3011);

+			return types;

+		}

+		if (editPart instanceof MultiFeatureUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(3);

+			types.add(ComrelElementTypes.SingleInputPort_3013);

+			types.add(ComrelElementTypes.MultiInputPort_3014);

+			types.add(ComrelElementTypes.MultiOutputPort_3015);

+			return types;

+		}

+		if (editPart instanceof SingleFilterUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3017);

+			types.add(ComrelElementTypes.SingleOutputPort_3018);

+			return types;

+		}

+		if (editPart instanceof MultiFilterUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.MultiInputPort_3020);

+			types.add(ComrelElementTypes.MultiOutputPort_3021);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnit6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnit7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3023);

+			types.add(ComrelElementTypes.MultiInputPort_3024);

+			return types;

+		}

+		if (editPart instanceof AtomicUnit4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+			return types;

+		}

+		if (editPart instanceof SequentialUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			return types;

+		}

+		if (editPart instanceof SequentialUnit6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnit6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+			return types;

+		}

+		if (editPart instanceof SequentialUnit7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3027);

+			types.add(ComrelElementTypes.MultiInputPort_3028);

+			return types;

+		}

+		if (editPart instanceof AtomicUnit5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnit7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

+			types.add(ComrelElementTypes.SingleInputPort_3031);

+			types.add(ComrelElementTypes.MultiInputPort_3032);

+			return types;

+		}

+		if (editPart instanceof AtomicUnit6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+			return types;

+		}

+		if (editPart instanceof AtomicUnit7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.SingleInputPort_3035);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(ComrelElementTypes.MultiFilterUnit_3019);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+			types.add(ComrelElementTypes.SequentialUnit_3026);

+			types.add(ComrelElementTypes.ConditionalUnit_3030);

+			types.add(ComrelElementTypes.AtomicUnit_3034);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(ComrelElementTypes.MultiFilterUnit_3019);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+			types.add(ComrelElementTypes.SequentialUnit_3026);

+			types.add(ComrelElementTypes.ConditionalUnit_3030);

+			types.add(ComrelElementTypes.AtomicUnit_3034);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(ComrelElementTypes.MultiFilterUnit_3041);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+			types.add(ComrelElementTypes.SequentialUnit_3044);

+			types.add(ComrelElementTypes.ConditionalUnit_3046);

+			types.add(ComrelElementTypes.AtomicUnit_3049);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(ComrelElementTypes.MultiFilterUnit_3019);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+			types.add(ComrelElementTypes.SequentialUnit_3026);

+			types.add(ComrelElementTypes.ConditionalUnit_3030);

+			types.add(ComrelElementTypes.AtomicUnit_3034);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(ComrelElementTypes.MultiFilterUnit_3058);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+			types.add(ComrelElementTypes.SequentialUnit_3060);

+			types.add(ComrelElementTypes.ConditionalUnit_3066);

+			types.add(ComrelElementTypes.AtomicUnit_3068);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(ComrelElementTypes.MultiFilterUnit_3019);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+			types.add(ComrelElementTypes.SequentialUnit_3026);

+			types.add(ComrelElementTypes.ConditionalUnit_3030);

+			types.add(ComrelElementTypes.AtomicUnit_3034);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+			types.add(ComrelElementTypes.SingleFilterUnit_3063);

+			types.add(ComrelElementTypes.MultiFilterUnit_3064);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+			types.add(ComrelElementTypes.SequentialUnit_3070);

+			types.add(ComrelElementTypes.ConditionalUnit_3071);

+			types.add(ComrelElementTypes.AtomicUnit_3074);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(ComrelElementTypes.MultiFilterUnit_3019);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+			types.add(ComrelElementTypes.SequentialUnit_3026);

+			types.add(ComrelElementTypes.ConditionalUnit_3030);

+			types.add(ComrelElementTypes.AtomicUnit_3034);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.ConditionCheck_3076);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(ComrelElementTypes.MultiFilterUnit_3053);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+			types.add(ComrelElementTypes.SequentialUnit_3069);

+			types.add(ComrelElementTypes.ConditionalUnit_3072);

+			types.add(ComrelElementTypes.AtomicUnit_3077);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+			types.add(ComrelElementTypes.SequentialUnit_3073);

+			types.add(ComrelElementTypes.ConditionalUnit_3075);

+			types.add(ComrelElementTypes.AtomicUnit_3078);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(ComrelElementTypes.MultiFilterUnit_3019);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+			types.add(ComrelElementTypes.SequentialUnit_3026);

+			types.add(ComrelElementTypes.ConditionalUnit_3030);

+			types.add(ComrelElementTypes.AtomicUnit_3034);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(ComrelElementTypes.MultiFilterUnit_3041);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+			types.add(ComrelElementTypes.SequentialUnit_3044);

+			types.add(ComrelElementTypes.ConditionalUnit_3046);

+			types.add(ComrelElementTypes.AtomicUnit_3049);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(ComrelElementTypes.MultiFilterUnit_3041);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+			types.add(ComrelElementTypes.SequentialUnit_3044);

+			types.add(ComrelElementTypes.ConditionalUnit_3046);

+			types.add(ComrelElementTypes.AtomicUnit_3049);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(ComrelElementTypes.MultiFilterUnit_3058);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+			types.add(ComrelElementTypes.SequentialUnit_3060);

+			types.add(ComrelElementTypes.ConditionalUnit_3066);

+			types.add(ComrelElementTypes.AtomicUnit_3068);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(ComrelElementTypes.MultiFilterUnit_3041);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+			types.add(ComrelElementTypes.SequentialUnit_3044);

+			types.add(ComrelElementTypes.ConditionalUnit_3046);

+			types.add(ComrelElementTypes.AtomicUnit_3049);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+			types.add(ComrelElementTypes.SingleFilterUnit_3063);

+			types.add(ComrelElementTypes.MultiFilterUnit_3064);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+			types.add(ComrelElementTypes.SequentialUnit_3070);

+			types.add(ComrelElementTypes.ConditionalUnit_3071);

+			types.add(ComrelElementTypes.AtomicUnit_3074);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(ComrelElementTypes.MultiFilterUnit_3041);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+			types.add(ComrelElementTypes.SequentialUnit_3044);

+			types.add(ComrelElementTypes.ConditionalUnit_3046);

+			types.add(ComrelElementTypes.AtomicUnit_3049);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.ConditionCheck_3076);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(ComrelElementTypes.MultiFilterUnit_3053);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+			types.add(ComrelElementTypes.SequentialUnit_3069);

+			types.add(ComrelElementTypes.ConditionalUnit_3072);

+			types.add(ComrelElementTypes.AtomicUnit_3077);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment2EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+			types.add(ComrelElementTypes.SequentialUnit_3073);

+			types.add(ComrelElementTypes.ConditionalUnit_3075);

+			types.add(ComrelElementTypes.AtomicUnit_3078);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3008);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3012);

+			types.add(ComrelElementTypes.SingleFilterUnit_3016);

+			types.add(ComrelElementTypes.MultiFilterUnit_3019);

+			return types;

+		}

+		if (editPart instanceof CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3003);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3004);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3022);

+			types.add(ComrelElementTypes.SequentialUnit_3026);

+			types.add(ComrelElementTypes.ConditionalUnit_3030);

+			types.add(ComrelElementTypes.AtomicUnit_3034);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(ComrelElementTypes.MultiFilterUnit_3041);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+			types.add(ComrelElementTypes.SequentialUnit_3044);

+			types.add(ComrelElementTypes.ConditionalUnit_3046);

+			types.add(ComrelElementTypes.AtomicUnit_3049);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(ComrelElementTypes.MultiFilterUnit_3058);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+			types.add(ComrelElementTypes.SequentialUnit_3060);

+			types.add(ComrelElementTypes.ConditionalUnit_3066);

+			types.add(ComrelElementTypes.AtomicUnit_3068);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(ComrelElementTypes.MultiFilterUnit_3058);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+			types.add(ComrelElementTypes.SequentialUnit_3060);

+			types.add(ComrelElementTypes.ConditionalUnit_3066);

+			types.add(ComrelElementTypes.AtomicUnit_3068);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+			types.add(ComrelElementTypes.SingleFilterUnit_3063);

+			types.add(ComrelElementTypes.MultiFilterUnit_3064);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+			types.add(ComrelElementTypes.SequentialUnit_3070);

+			types.add(ComrelElementTypes.ConditionalUnit_3071);

+			types.add(ComrelElementTypes.AtomicUnit_3074);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(ComrelElementTypes.MultiFilterUnit_3058);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+			types.add(ComrelElementTypes.SequentialUnit_3060);

+			types.add(ComrelElementTypes.ConditionalUnit_3066);

+			types.add(ComrelElementTypes.AtomicUnit_3068);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.ConditionCheck_3076);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(ComrelElementTypes.MultiFilterUnit_3053);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+			types.add(ComrelElementTypes.SequentialUnit_3069);

+			types.add(ComrelElementTypes.ConditionalUnit_3072);

+			types.add(ComrelElementTypes.AtomicUnit_3077);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment3EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+			types.add(ComrelElementTypes.SequentialUnit_3073);

+			types.add(ComrelElementTypes.ConditionalUnit_3075);

+			types.add(ComrelElementTypes.AtomicUnit_3078);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(ComrelElementTypes.MultiFilterUnit_3058);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+			types.add(ComrelElementTypes.SequentialUnit_3060);

+			types.add(ComrelElementTypes.ConditionalUnit_3066);

+			types.add(ComrelElementTypes.AtomicUnit_3068);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+			types.add(ComrelElementTypes.SingleFilterUnit_3063);

+			types.add(ComrelElementTypes.MultiFilterUnit_3064);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+			types.add(ComrelElementTypes.SequentialUnit_3070);

+			types.add(ComrelElementTypes.ConditionalUnit_3071);

+			types.add(ComrelElementTypes.AtomicUnit_3074);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+			types.add(ComrelElementTypes.SingleFilterUnit_3063);

+			types.add(ComrelElementTypes.MultiFilterUnit_3064);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+			types.add(ComrelElementTypes.SequentialUnit_3070);

+			types.add(ComrelElementTypes.ConditionalUnit_3071);

+			types.add(ComrelElementTypes.AtomicUnit_3074);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.ConditionCheck_3076);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(ComrelElementTypes.MultiFilterUnit_3053);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+			types.add(ComrelElementTypes.SequentialUnit_3069);

+			types.add(ComrelElementTypes.ConditionalUnit_3072);

+			types.add(ComrelElementTypes.AtomicUnit_3077);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment4EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+			types.add(ComrelElementTypes.SequentialUnit_3073);

+			types.add(ComrelElementTypes.ConditionalUnit_3075);

+			types.add(ComrelElementTypes.AtomicUnit_3078);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.ConditionCheck_3076);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(ComrelElementTypes.MultiFilterUnit_3053);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+			types.add(ComrelElementTypes.SequentialUnit_3069);

+			types.add(ComrelElementTypes.ConditionalUnit_3072);

+			types.add(ComrelElementTypes.AtomicUnit_3077);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment5EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+			types.add(ComrelElementTypes.SequentialUnit_3073);

+			types.add(ComrelElementTypes.ConditionalUnit_3075);

+			types.add(ComrelElementTypes.AtomicUnit_3078);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+			types.add(ComrelElementTypes.SingleFilterUnit_3063);

+			types.add(ComrelElementTypes.MultiFilterUnit_3064);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+			types.add(ComrelElementTypes.SequentialUnit_3070);

+			types.add(ComrelElementTypes.ConditionalUnit_3071);

+			types.add(ComrelElementTypes.AtomicUnit_3074);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.ConditionCheck_3076);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(ComrelElementTypes.MultiFilterUnit_3053);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+			types.add(ComrelElementTypes.SequentialUnit_3069);

+			types.add(ComrelElementTypes.ConditionalUnit_3072);

+			types.add(ComrelElementTypes.AtomicUnit_3077);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment6EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+			types.add(ComrelElementTypes.SequentialUnit_3073);

+			types.add(ComrelElementTypes.ConditionalUnit_3075);

+			types.add(ComrelElementTypes.AtomicUnit_3078);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3038);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3039);

+			types.add(ComrelElementTypes.SingleFilterUnit_3040);

+			types.add(ComrelElementTypes.MultiFilterUnit_3041);

+			return types;

+		}

+		if (editPart instanceof ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3007);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3037);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3042);

+			types.add(ComrelElementTypes.SequentialUnit_3044);

+			types.add(ComrelElementTypes.ConditionalUnit_3046);

+			types.add(ComrelElementTypes.AtomicUnit_3049);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3055);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3056);

+			types.add(ComrelElementTypes.SingleFilterUnit_3057);

+			types.add(ComrelElementTypes.MultiFilterUnit_3058);

+			return types;

+		}

+		if (editPart instanceof SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3025);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3043);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3059);

+			types.add(ComrelElementTypes.SequentialUnit_3060);

+			types.add(ComrelElementTypes.ConditionalUnit_3066);

+			types.add(ComrelElementTypes.AtomicUnit_3068);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3061);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3062);

+			types.add(ComrelElementTypes.SingleFilterUnit_3063);

+			types.add(ComrelElementTypes.MultiFilterUnit_3064);

+			return types;

+		}

+		if (editPart instanceof SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3029);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3045);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3065);

+			types.add(ComrelElementTypes.SequentialUnit_3070);

+			types.add(ComrelElementTypes.ConditionalUnit_3071);

+			types.add(ComrelElementTypes.AtomicUnit_3074);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitIfCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(ComrelElementTypes.ConditionCheck_3076);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(4);

+			types.add(ComrelElementTypes.SingleFeatureUnit_3050);

+			types.add(ComrelElementTypes.MultiFeatureUnit_3051);

+			types.add(ComrelElementTypes.SingleFilterUnit_3052);

+			types.add(ComrelElementTypes.MultiFilterUnit_3053);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitThenCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3033);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3036);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3054);

+			types.add(ComrelElementTypes.SequentialUnit_3069);

+			types.add(ComrelElementTypes.ConditionalUnit_3072);

+			types.add(ComrelElementTypes.AtomicUnit_3077);

+			return types;

+		}

+		if (editPart instanceof ConditionalUnitConditionalUnitElseCompartment7EditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(6);

+			types.add(ComrelElementTypes.CartesianQueuedUnit_3047);

+			types.add(ComrelElementTypes.ParallelQueuedUnit_3048);

+			types.add(ComrelElementTypes.SingleQueuedUnit_3067);

+			types.add(ComrelElementTypes.SequentialUnit_3073);

+			types.add(ComrelElementTypes.ConditionalUnit_3075);

+			types.add(ComrelElementTypes.AtomicUnit_3078);

+			return types;

+		}

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List getRelTypesOnSource(IAdaptable source) {

+		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart) source

+				.getAdapter(IGraphicalEditPart.class);

+		if (sourceEditPart instanceof SingleInputPortEditPart) {

+			return ((SingleInputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort2EditPart) {

+			return ((SingleInputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPortEditPart) {

+			return ((MultiInputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort3EditPart) {

+			return ((SingleInputPort3EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort2EditPart) {

+			return ((MultiInputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort4EditPart) {

+			return ((SingleInputPort4EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort3EditPart) {

+			return ((MultiInputPort3EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleOutputPortEditPart) {

+			return ((SingleOutputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort5EditPart) {

+			return ((SingleInputPort5EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort4EditPart) {

+			return ((MultiInputPort4EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiOutputPortEditPart) {

+			return ((MultiOutputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort5EditPart) {

+			return ((MultiInputPort5EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleOutputPort2EditPart) {

+			return ((SingleOutputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort6EditPart) {

+			return ((MultiInputPort6EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiOutputPort2EditPart) {

+			return ((MultiOutputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort6EditPart) {

+			return ((SingleInputPort6EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort7EditPart) {

+			return ((MultiInputPort7EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort7EditPart) {

+			return ((SingleInputPort7EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort8EditPart) {

+			return ((MultiInputPort8EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort8EditPart) {

+			return ((SingleInputPort8EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof MultiInputPort9EditPart) {

+			return ((MultiInputPort9EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		if (sourceEditPart instanceof SingleInputPort9EditPart) {

+			return ((SingleInputPort9EditPart) sourceEditPart)

+					.getMARelTypesOnSource();

+		}

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List getRelTypesOnTarget(IAdaptable target) {

+		IGraphicalEditPart targetEditPart = (IGraphicalEditPart) target

+				.getAdapter(IGraphicalEditPart.class);

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			return ((SingleInputPortEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			return ((SingleInputPort2EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			return ((MultiInputPortEditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			return ((SingleInputPort3EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			return ((MultiInputPort2EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			return ((SingleInputPort4EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			return ((MultiInputPort3EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			return ((SingleInputPort5EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			return ((MultiInputPort4EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			return ((MultiInputPort5EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			return ((MultiInputPort6EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			return ((SingleInputPort6EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			return ((MultiInputPort7EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			return ((SingleInputPort7EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			return ((MultiInputPort8EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			return ((SingleInputPort8EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			return ((MultiInputPort9EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			return ((SingleInputPort9EditPart) targetEditPart)

+					.getMARelTypesOnTarget();

+		}

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List getRelTypesOnSourceAndTarget(IAdaptable source,

+			IAdaptable target) {

+		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart) source

+				.getAdapter(IGraphicalEditPart.class);

+		IGraphicalEditPart targetEditPart = (IGraphicalEditPart) target

+				.getAdapter(IGraphicalEditPart.class);

+		if (sourceEditPart instanceof SingleInputPortEditPart) {

+			return ((SingleInputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort2EditPart) {

+			return ((SingleInputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPortEditPart) {

+			return ((MultiInputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort3EditPart) {

+			return ((SingleInputPort3EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort2EditPart) {

+			return ((MultiInputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort4EditPart) {

+			return ((SingleInputPort4EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort3EditPart) {

+			return ((MultiInputPort3EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleOutputPortEditPart) {

+			return ((SingleOutputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort5EditPart) {

+			return ((SingleInputPort5EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort4EditPart) {

+			return ((MultiInputPort4EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiOutputPortEditPart) {

+			return ((MultiOutputPortEditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort5EditPart) {

+			return ((MultiInputPort5EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleOutputPort2EditPart) {

+			return ((SingleOutputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort6EditPart) {

+			return ((MultiInputPort6EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiOutputPort2EditPart) {

+			return ((MultiOutputPort2EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort6EditPart) {

+			return ((SingleInputPort6EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort7EditPart) {

+			return ((MultiInputPort7EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort7EditPart) {

+			return ((SingleInputPort7EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort8EditPart) {

+			return ((MultiInputPort8EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort8EditPart) {

+			return ((SingleInputPort8EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof MultiInputPort9EditPart) {

+			return ((MultiInputPort9EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		if (sourceEditPart instanceof SingleInputPort9EditPart) {

+			return ((SingleInputPort9EditPart) sourceEditPart)

+					.getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List getTypesForSource(IAdaptable target,

+			IElementType relationshipType) {

+		IGraphicalEditPart targetEditPart = (IGraphicalEditPart) target

+				.getAdapter(IGraphicalEditPart.class);

+		if (targetEditPart instanceof SingleInputPortEditPart) {

+			return ((SingleInputPortEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort2EditPart) {

+			return ((SingleInputPort2EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPortEditPart) {

+			return ((MultiInputPortEditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort3EditPart) {

+			return ((SingleInputPort3EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort2EditPart) {

+			return ((MultiInputPort2EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort4EditPart) {

+			return ((SingleInputPort4EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort3EditPart) {

+			return ((MultiInputPort3EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort5EditPart) {

+			return ((SingleInputPort5EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort4EditPart) {

+			return ((MultiInputPort4EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort5EditPart) {

+			return ((MultiInputPort5EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort6EditPart) {

+			return ((MultiInputPort6EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort6EditPart) {

+			return ((SingleInputPort6EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort7EditPart) {

+			return ((MultiInputPort7EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort7EditPart) {

+			return ((SingleInputPort7EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort8EditPart) {

+			return ((MultiInputPort8EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort8EditPart) {

+			return ((SingleInputPort8EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof MultiInputPort9EditPart) {

+			return ((MultiInputPort9EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		if (targetEditPart instanceof SingleInputPort9EditPart) {

+			return ((SingleInputPort9EditPart) targetEditPart)

+					.getMATypesForSource(relationshipType);

+		}

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List getTypesForTarget(IAdaptable source,

+			IElementType relationshipType) {

+		IGraphicalEditPart sourceEditPart = (IGraphicalEditPart) source

+				.getAdapter(IGraphicalEditPart.class);

+		if (sourceEditPart instanceof SingleInputPortEditPart) {

+			return ((SingleInputPortEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort2EditPart) {

+			return ((SingleInputPort2EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPortEditPart) {

+			return ((MultiInputPortEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort3EditPart) {

+			return ((SingleInputPort3EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort2EditPart) {

+			return ((MultiInputPort2EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort4EditPart) {

+			return ((SingleInputPort4EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort3EditPart) {

+			return ((MultiInputPort3EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleOutputPortEditPart) {

+			return ((SingleOutputPortEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort5EditPart) {

+			return ((SingleInputPort5EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort4EditPart) {

+			return ((MultiInputPort4EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiOutputPortEditPart) {

+			return ((MultiOutputPortEditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort5EditPart) {

+			return ((MultiInputPort5EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleOutputPort2EditPart) {

+			return ((SingleOutputPort2EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort6EditPart) {

+			return ((MultiInputPort6EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiOutputPort2EditPart) {

+			return ((MultiOutputPort2EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort6EditPart) {

+			return ((SingleInputPort6EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort7EditPart) {

+			return ((MultiInputPort7EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort7EditPart) {

+			return ((SingleInputPort7EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort8EditPart) {

+			return ((MultiInputPort8EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort8EditPart) {

+			return ((SingleInputPort8EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof MultiInputPort9EditPart) {

+			return ((MultiInputPort9EditPart) sourceEditPart)

+					.getMATypesForTarget(relationshipType);

+		}

+		if (sourceEditPart instanceof SingleInputPort9EditPart) {

+			return ((SingleInputPort9EditPart) sourceEditPart)

+					.getMATypesForTarget(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();

+		HashSet<EObject> elements = new HashSet<EObject>();

+		for (Iterator<EObject> it = diagram.getElement().eAllContents(); it

+				.hasNext();) {

+			EObject element = 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(

+				ComrelDiagramEditorPlugin.getInstance()

+						.getItemProvidersAdapterFactory());

+		ElementListSelectionDialog dialog = new ElementListSelectionDialog(

+				shell, labelProvider);

+		dialog.setMessage(Messages.ComrelModelingAssistantProviderMessage);

+		dialog.setTitle(Messages.ComrelModelingAssistantProviderTitle);

+		dialog.setMultipleSelection(false);

+		dialog.setElements(elements);

+		EObject selected = null;

+		if (dialog.open() == Window.OK) {

+			selected = (EObject) dialog.getFirstResult();

+		}

+		return selected;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelParserProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelParserProvider.java
new file mode 100644
index 0000000..7d9fa61
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelParserProvider.java
@@ -0,0 +1,2261 @@
+/*

+ * 

+ */

+package comrel.diagram.providers;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EObject;

+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.common.ui.services.parser.ParserService;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.ComrelPackage;

+import comrel.diagram.edit.parts.AtomicUnitLabelType2EditPart;

+import comrel.diagram.edit.parts.AtomicUnitLabelType3EditPart;

+import comrel.diagram.edit.parts.AtomicUnitLabelType4EditPart;

+import comrel.diagram.edit.parts.AtomicUnitLabelType5EditPart;

+import comrel.diagram.edit.parts.AtomicUnitLabelType6EditPart;

+import comrel.diagram.edit.parts.AtomicUnitLabelType7EditPart;

+import comrel.diagram.edit.parts.AtomicUnitLabelTypeEditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict2EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict3EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict4EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict5EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict6EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrict7EditPart;

+import comrel.diagram.edit.parts.CartesianQueuedUnitNameTypeLblStrictEditPart;

+import comrel.diagram.edit.parts.ConditionCheckNameTypeSpecEditPart;

+import comrel.diagram.edit.parts.ConditionalUnitNameType2EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitNameType3EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitNameType4EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitNameType5EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitNameType6EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitNameType7EditPart;

+import comrel.diagram.edit.parts.ConditionalUnitNameTypeEditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitNameType2EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitNameType3EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitNameType4EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitNameType5EditPart;

+import comrel.diagram.edit.parts.MultiFeatureUnitNameTypeEditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitNameType2EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitNameType3EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitNameType4EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitNameType5EditPart;

+import comrel.diagram.edit.parts.MultiFilterUnitNameTypeEditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType2EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType3EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType4EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType5EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType6EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType7EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType8EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameType9EditPart;

+import comrel.diagram.edit.parts.MultiInputPortNameTypeEditPart;

+import comrel.diagram.edit.parts.MultiOutputPortNameType2EditPart;

+import comrel.diagram.edit.parts.MultiOutputPortNameTypeEditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict2EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict3EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict4EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict5EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict6EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrict7EditPart;

+import comrel.diagram.edit.parts.ParallelQueuedUnitNameTypeLblStrictEditPart;

+import comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict2EditPart;

+import comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict3EditPart;

+import comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict4EditPart;

+import comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict5EditPart;

+import comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict6EditPart;

+import comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrict7EditPart;

+import comrel.diagram.edit.parts.SequentialUnitNameTypeLblStrictEditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitNameType2EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitNameType3EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitNameType4EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitNameType5EditPart;

+import comrel.diagram.edit.parts.SingleFeatureUnitNameTypeEditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitNameType2EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitNameType3EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitNameType4EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitNameType5EditPart;

+import comrel.diagram.edit.parts.SingleFilterUnitNameTypeEditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType2EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType3EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType4EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType5EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType6EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType7EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType8EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameType9EditPart;

+import comrel.diagram.edit.parts.SingleInputPortNameTypeEditPart;

+import comrel.diagram.edit.parts.SingleOutputPortNameType2EditPart;

+import comrel.diagram.edit.parts.SingleOutputPortNameTypeEditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict2EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict3EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict4EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict5EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict6EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrict7EditPart;

+import comrel.diagram.edit.parts.SingleQueuedUnitNameTypeLblStrictEditPart;

+import comrel.diagram.parsers.MessageFormatParser;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelParserProvider extends AbstractProvider implements

+		IParserProvider {

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5001Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5001Parser() {

+		if (singleInputPortNameType_5001Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5001Parser = parser;

+		}

+		return singleInputPortNameType_5001Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser cartesianQueuedUnitNameTypeLblStrict_5080Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCartesianQueuedUnitNameTypeLblStrict_5080Parser() {

+		if (cartesianQueuedUnitNameTypeLblStrict_5080Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			cartesianQueuedUnitNameTypeLblStrict_5080Parser = parser;

+		}

+		return cartesianQueuedUnitNameTypeLblStrict_5080Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parallelQueuedUnitNameTypeLblStrict_5081Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParallelQueuedUnitNameTypeLblStrict_5081Parser() {

+		if (parallelQueuedUnitNameTypeLblStrict_5081Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parallelQueuedUnitNameTypeLblStrict_5081Parser = parser;

+		}

+		return parallelQueuedUnitNameTypeLblStrict_5081Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleQueuedUnitNameTypeLblStrict_5082Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleQueuedUnitNameTypeLblStrict_5082Parser() {

+		if (singleQueuedUnitNameTypeLblStrict_5082Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			singleQueuedUnitNameTypeLblStrict_5082Parser = parser;

+		}

+		return singleQueuedUnitNameTypeLblStrict_5082Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser sequentialUnitNameTypeLblStrict_5083Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSequentialUnitNameTypeLblStrict_5083Parser() {

+		if (sequentialUnitNameTypeLblStrict_5083Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_Type(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			sequentialUnitNameTypeLblStrict_5083Parser = parser;

+		}

+		return sequentialUnitNameTypeLblStrict_5083Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionalUnitNameType_5084Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionalUnitNameType_5084Parser() {

+		if (conditionalUnitNameType_5084Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionalUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			conditionalUnitNameType_5084Parser = parser;

+		}

+		return conditionalUnitNameType_5084Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser atomicUnitLabelType_5085Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAtomicUnitLabelType_5085Parser() {

+		if (atomicUnitLabelType_5085Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getAtomicUnit_Label(),

+					ComrelPackage.eINSTANCE.getAtomicUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			atomicUnitLabelType_5085Parser = parser;

+		}

+		return atomicUnitLabelType_5085Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5002Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5002Parser() {

+		if (singleInputPortNameType_5002Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5002Parser = parser;

+		}

+		return singleInputPortNameType_5002Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5003Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5003Parser() {

+		if (multiInputPortNameType_5003Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5003Parser = parser;

+		}

+		return multiInputPortNameType_5003Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser cartesianQueuedUnitNameTypeLblStrict_5079Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCartesianQueuedUnitNameTypeLblStrict_5079Parser() {

+		if (cartesianQueuedUnitNameTypeLblStrict_5079Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			cartesianQueuedUnitNameTypeLblStrict_5079Parser = parser;

+		}

+		return cartesianQueuedUnitNameTypeLblStrict_5079Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parallelQueuedUnitNameTypeLblStrict_5078Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParallelQueuedUnitNameTypeLblStrict_5078Parser() {

+		if (parallelQueuedUnitNameTypeLblStrict_5078Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parallelQueuedUnitNameTypeLblStrict_5078Parser = parser;

+		}

+		return parallelQueuedUnitNameTypeLblStrict_5078Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5004Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5004Parser() {

+		if (singleInputPortNameType_5004Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5004Parser = parser;

+		}

+		return singleInputPortNameType_5004Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5005Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5005Parser() {

+		if (multiInputPortNameType_5005Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5005Parser = parser;

+		}

+		return multiInputPortNameType_5005Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser cartesianQueuedUnitNameTypeLblStrict_5077Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCartesianQueuedUnitNameTypeLblStrict_5077Parser() {

+		if (cartesianQueuedUnitNameTypeLblStrict_5077Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			cartesianQueuedUnitNameTypeLblStrict_5077Parser = parser;

+		}

+		return cartesianQueuedUnitNameTypeLblStrict_5077Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFeatureUnitNameType_5009Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFeatureUnitNameType_5009Parser() {

+		if (singleFeatureUnitNameType_5009Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFeatureUnitNameType_5009Parser = parser;

+		}

+		return singleFeatureUnitNameType_5009Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5006Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5006Parser() {

+		if (singleInputPortNameType_5006Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5006Parser = parser;

+		}

+		return singleInputPortNameType_5006Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5007Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5007Parser() {

+		if (multiInputPortNameType_5007Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5007Parser = parser;

+		}

+		return multiInputPortNameType_5007Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleOutputPortNameType_5008Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleOutputPortNameType_5008Parser() {

+		if (singleOutputPortNameType_5008Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleOutputPortNameType_5008Parser = parser;

+		}

+		return singleOutputPortNameType_5008Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFeatureUnitNameType_5013Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFeatureUnitNameType_5013Parser() {

+		if (multiFeatureUnitNameType_5013Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFeatureUnitNameType_5013Parser = parser;

+		}

+		return multiFeatureUnitNameType_5013Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5010Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5010Parser() {

+		if (singleInputPortNameType_5010Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5010Parser = parser;

+		}

+		return singleInputPortNameType_5010Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5011Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5011Parser() {

+		if (multiInputPortNameType_5011Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5011Parser = parser;

+		}

+		return multiInputPortNameType_5011Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiOutputPortNameType_5012Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiOutputPortNameType_5012Parser() {

+		if (multiOutputPortNameType_5012Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiOutputPortNameType_5012Parser = parser;

+		}

+		return multiOutputPortNameType_5012Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFilterUnitNameType_5016Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFilterUnitNameType_5016Parser() {

+		if (singleFilterUnitNameType_5016Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFilterUnitNameType_5016Parser = parser;

+		}

+		return singleFilterUnitNameType_5016Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5014Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5014Parser() {

+		if (multiInputPortNameType_5014Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5014Parser = parser;

+		}

+		return multiInputPortNameType_5014Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleOutputPortNameType_5015Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleOutputPortNameType_5015Parser() {

+		if (singleOutputPortNameType_5015Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleOutputPortNameType_5015Parser = parser;

+		}

+		return singleOutputPortNameType_5015Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFilterUnitNameType_5019Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFilterUnitNameType_5019Parser() {

+		if (multiFilterUnitNameType_5019Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFilterUnitNameType_5019Parser = parser;

+		}

+		return multiFilterUnitNameType_5019Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5017Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5017Parser() {

+		if (multiInputPortNameType_5017Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5017Parser = parser;

+		}

+		return multiInputPortNameType_5017Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiOutputPortNameType_5018Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiOutputPortNameType_5018Parser() {

+		if (multiOutputPortNameType_5018Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiOutputPortNameType_5018Parser = parser;

+		}

+		return multiOutputPortNameType_5018Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleQueuedUnitNameTypeLblStrict_5076Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleQueuedUnitNameTypeLblStrict_5076Parser() {

+		if (singleQueuedUnitNameTypeLblStrict_5076Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			singleQueuedUnitNameTypeLblStrict_5076Parser = parser;

+		}

+		return singleQueuedUnitNameTypeLblStrict_5076Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5020Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5020Parser() {

+		if (singleInputPortNameType_5020Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5020Parser = parser;

+		}

+		return singleInputPortNameType_5020Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5021Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5021Parser() {

+		if (multiInputPortNameType_5021Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5021Parser = parser;

+		}

+		return multiInputPortNameType_5021Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser cartesianQueuedUnitNameTypeLblStrict_5075Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCartesianQueuedUnitNameTypeLblStrict_5075Parser() {

+		if (cartesianQueuedUnitNameTypeLblStrict_5075Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			cartesianQueuedUnitNameTypeLblStrict_5075Parser = parser;

+		}

+		return cartesianQueuedUnitNameTypeLblStrict_5075Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser sequentialUnitNameTypeLblStrict_5074Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSequentialUnitNameTypeLblStrict_5074Parser() {

+		if (sequentialUnitNameTypeLblStrict_5074Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_Type(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			sequentialUnitNameTypeLblStrict_5074Parser = parser;

+		}

+		return sequentialUnitNameTypeLblStrict_5074Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5022Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5022Parser() {

+		if (singleInputPortNameType_5022Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5022Parser = parser;

+		}

+		return singleInputPortNameType_5022Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5023Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5023Parser() {

+		if (multiInputPortNameType_5023Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5023Parser = parser;

+		}

+		return multiInputPortNameType_5023Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser cartesianQueuedUnitNameTypeLblStrict_5073Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCartesianQueuedUnitNameTypeLblStrict_5073Parser() {

+		if (cartesianQueuedUnitNameTypeLblStrict_5073Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			cartesianQueuedUnitNameTypeLblStrict_5073Parser = parser;

+		}

+		return cartesianQueuedUnitNameTypeLblStrict_5073Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionalUnitNameType_5072Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionalUnitNameType_5072Parser() {

+		if (conditionalUnitNameType_5072Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionalUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			conditionalUnitNameType_5072Parser = parser;

+		}

+		return conditionalUnitNameType_5072Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5024Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5024Parser() {

+		if (singleInputPortNameType_5024Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5024Parser = parser;

+		}

+		return singleInputPortNameType_5024Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiInputPortNameType_5025Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiInputPortNameType_5025Parser() {

+		if (multiInputPortNameType_5025Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiInputPortNameType_5025Parser = parser;

+		}

+		return multiInputPortNameType_5025Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser cartesianQueuedUnitNameTypeLblStrict_5028Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCartesianQueuedUnitNameTypeLblStrict_5028Parser() {

+		if (cartesianQueuedUnitNameTypeLblStrict_5028Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			cartesianQueuedUnitNameTypeLblStrict_5028Parser = parser;

+		}

+		return cartesianQueuedUnitNameTypeLblStrict_5028Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser atomicUnitLabelType_5027Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAtomicUnitLabelType_5027Parser() {

+		if (atomicUnitLabelType_5027Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getAtomicUnit_Label(),

+					ComrelPackage.eINSTANCE.getAtomicUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			atomicUnitLabelType_5027Parser = parser;

+		}

+		return atomicUnitLabelType_5027Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleInputPortNameType_5026Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleInputPortNameType_5026Parser() {

+		if (singleInputPortNameType_5026Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getPort_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleInputPortNameType_5026Parser = parser;

+		}

+		return singleInputPortNameType_5026Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parallelQueuedUnitNameTypeLblStrict_5071Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParallelQueuedUnitNameTypeLblStrict_5071Parser() {

+		if (parallelQueuedUnitNameTypeLblStrict_5071Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parallelQueuedUnitNameTypeLblStrict_5071Parser = parser;

+		}

+		return parallelQueuedUnitNameTypeLblStrict_5071Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parallelQueuedUnitNameTypeLblStrict_5070Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParallelQueuedUnitNameTypeLblStrict_5070Parser() {

+		if (parallelQueuedUnitNameTypeLblStrict_5070Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parallelQueuedUnitNameTypeLblStrict_5070Parser = parser;

+		}

+		return parallelQueuedUnitNameTypeLblStrict_5070Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFeatureUnitNameType_5029Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFeatureUnitNameType_5029Parser() {

+		if (singleFeatureUnitNameType_5029Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFeatureUnitNameType_5029Parser = parser;

+		}

+		return singleFeatureUnitNameType_5029Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFeatureUnitNameType_5030Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFeatureUnitNameType_5030Parser() {

+		if (multiFeatureUnitNameType_5030Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFeatureUnitNameType_5030Parser = parser;

+		}

+		return multiFeatureUnitNameType_5030Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFilterUnitNameType_5031Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFilterUnitNameType_5031Parser() {

+		if (singleFilterUnitNameType_5031Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFilterUnitNameType_5031Parser = parser;

+		}

+		return singleFilterUnitNameType_5031Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFilterUnitNameType_5032Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFilterUnitNameType_5032Parser() {

+		if (multiFilterUnitNameType_5032Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFilterUnitNameType_5032Parser = parser;

+		}

+		return multiFilterUnitNameType_5032Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleQueuedUnitNameTypeLblStrict_5069Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleQueuedUnitNameTypeLblStrict_5069Parser() {

+		if (singleQueuedUnitNameTypeLblStrict_5069Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			singleQueuedUnitNameTypeLblStrict_5069Parser = parser;

+		}

+		return singleQueuedUnitNameTypeLblStrict_5069Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parallelQueuedUnitNameTypeLblStrict_5068Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParallelQueuedUnitNameTypeLblStrict_5068Parser() {

+		if (parallelQueuedUnitNameTypeLblStrict_5068Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parallelQueuedUnitNameTypeLblStrict_5068Parser = parser;

+		}

+		return parallelQueuedUnitNameTypeLblStrict_5068Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser sequentialUnitNameTypeLblStrict_5067Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSequentialUnitNameTypeLblStrict_5067Parser() {

+		if (sequentialUnitNameTypeLblStrict_5067Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_Type(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			sequentialUnitNameTypeLblStrict_5067Parser = parser;

+		}

+		return sequentialUnitNameTypeLblStrict_5067Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parallelQueuedUnitNameTypeLblStrict_5066Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParallelQueuedUnitNameTypeLblStrict_5066Parser() {

+		if (parallelQueuedUnitNameTypeLblStrict_5066Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parallelQueuedUnitNameTypeLblStrict_5066Parser = parser;

+		}

+		return parallelQueuedUnitNameTypeLblStrict_5066Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionalUnitNameType_5065Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionalUnitNameType_5065Parser() {

+		if (conditionalUnitNameType_5065Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionalUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			conditionalUnitNameType_5065Parser = parser;

+		}

+		return conditionalUnitNameType_5065Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser cartesianQueuedUnitNameTypeLblStrict_5033Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCartesianQueuedUnitNameTypeLblStrict_5033Parser() {

+		if (cartesianQueuedUnitNameTypeLblStrict_5033Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getCartesianQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			cartesianQueuedUnitNameTypeLblStrict_5033Parser = parser;

+		}

+		return cartesianQueuedUnitNameTypeLblStrict_5033Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parallelQueuedUnitNameTypeLblStrict_5035Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParallelQueuedUnitNameTypeLblStrict_5035Parser() {

+		if (parallelQueuedUnitNameTypeLblStrict_5035Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getParallelQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parallelQueuedUnitNameTypeLblStrict_5035Parser = parser;

+		}

+		return parallelQueuedUnitNameTypeLblStrict_5035Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser atomicUnitLabelType_5034Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAtomicUnitLabelType_5034Parser() {

+		if (atomicUnitLabelType_5034Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getAtomicUnit_Label(),

+					ComrelPackage.eINSTANCE.getAtomicUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			atomicUnitLabelType_5034Parser = parser;

+		}

+		return atomicUnitLabelType_5034Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFeatureUnitNameType_5036Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFeatureUnitNameType_5036Parser() {

+		if (singleFeatureUnitNameType_5036Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFeatureUnitNameType_5036Parser = parser;

+		}

+		return singleFeatureUnitNameType_5036Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFeatureUnitNameType_5037Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFeatureUnitNameType_5037Parser() {

+		if (multiFeatureUnitNameType_5037Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFeatureUnitNameType_5037Parser = parser;

+		}

+		return multiFeatureUnitNameType_5037Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFilterUnitNameType_5038Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFilterUnitNameType_5038Parser() {

+		if (singleFilterUnitNameType_5038Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFilterUnitNameType_5038Parser = parser;

+		}

+		return singleFilterUnitNameType_5038Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFilterUnitNameType_5039Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFilterUnitNameType_5039Parser() {

+		if (multiFilterUnitNameType_5039Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFilterUnitNameType_5039Parser = parser;

+		}

+		return multiFilterUnitNameType_5039Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleQueuedUnitNameTypeLblStrict_5064Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleQueuedUnitNameTypeLblStrict_5064Parser() {

+		if (singleQueuedUnitNameTypeLblStrict_5064Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			singleQueuedUnitNameTypeLblStrict_5064Parser = parser;

+		}

+		return singleQueuedUnitNameTypeLblStrict_5064Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFeatureUnitNameType_5040Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFeatureUnitNameType_5040Parser() {

+		if (singleFeatureUnitNameType_5040Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFeatureUnitNameType_5040Parser = parser;

+		}

+		return singleFeatureUnitNameType_5040Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFeatureUnitNameType_5041Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFeatureUnitNameType_5041Parser() {

+		if (multiFeatureUnitNameType_5041Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFeatureUnitNameType_5041Parser = parser;

+		}

+		return multiFeatureUnitNameType_5041Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFilterUnitNameType_5042Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFilterUnitNameType_5042Parser() {

+		if (singleFilterUnitNameType_5042Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFilterUnitNameType_5042Parser = parser;

+		}

+		return singleFilterUnitNameType_5042Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFilterUnitNameType_5043Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFilterUnitNameType_5043Parser() {

+		if (multiFilterUnitNameType_5043Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFilterUnitNameType_5043Parser = parser;

+		}

+		return multiFilterUnitNameType_5043Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleQueuedUnitNameTypeLblStrict_5063Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleQueuedUnitNameTypeLblStrict_5063Parser() {

+		if (singleQueuedUnitNameTypeLblStrict_5063Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			singleQueuedUnitNameTypeLblStrict_5063Parser = parser;

+		}

+		return singleQueuedUnitNameTypeLblStrict_5063Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser sequentialUnitNameTypeLblStrict_5062Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSequentialUnitNameTypeLblStrict_5062Parser() {

+		if (sequentialUnitNameTypeLblStrict_5062Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_Type(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			sequentialUnitNameTypeLblStrict_5062Parser = parser;

+		}

+		return sequentialUnitNameTypeLblStrict_5062Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFeatureUnitNameType_5044Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFeatureUnitNameType_5044Parser() {

+		if (singleFeatureUnitNameType_5044Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFeatureUnitNameType_5044Parser = parser;

+		}

+		return singleFeatureUnitNameType_5044Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFeatureUnitNameType_5045Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFeatureUnitNameType_5045Parser() {

+		if (multiFeatureUnitNameType_5045Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFeatureUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFeatureUnitNameType_5045Parser = parser;

+		}

+		return multiFeatureUnitNameType_5045Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleFilterUnitNameType_5046Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleFilterUnitNameType_5046Parser() {

+		if (singleFilterUnitNameType_5046Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			singleFilterUnitNameType_5046Parser = parser;

+		}

+		return singleFilterUnitNameType_5046Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser multiFilterUnitNameType_5047Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getMultiFilterUnitNameType_5047Parser() {

+		if (multiFilterUnitNameType_5047Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getMultiFilterUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			multiFilterUnitNameType_5047Parser = parser;

+		}

+		return multiFilterUnitNameType_5047Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleQueuedUnitNameTypeLblStrict_5061Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleQueuedUnitNameTypeLblStrict_5061Parser() {

+		if (singleQueuedUnitNameTypeLblStrict_5061Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			singleQueuedUnitNameTypeLblStrict_5061Parser = parser;

+		}

+		return singleQueuedUnitNameTypeLblStrict_5061Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionalUnitNameType_5060Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionalUnitNameType_5060Parser() {

+		if (conditionalUnitNameType_5060Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionalUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			conditionalUnitNameType_5060Parser = parser;

+		}

+		return conditionalUnitNameType_5060Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser singleQueuedUnitNameTypeLblStrict_5049Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSingleQueuedUnitNameTypeLblStrict_5049Parser() {

+		if (singleQueuedUnitNameTypeLblStrict_5049Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_Type(),

+					ComrelPackage.eINSTANCE.getSingleQueuedUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			singleQueuedUnitNameTypeLblStrict_5049Parser = parser;

+		}

+		return singleQueuedUnitNameTypeLblStrict_5049Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser atomicUnitLabelType_5048Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAtomicUnitLabelType_5048Parser() {

+		if (atomicUnitLabelType_5048Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getAtomicUnit_Label(),

+					ComrelPackage.eINSTANCE.getAtomicUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			atomicUnitLabelType_5048Parser = parser;

+		}

+		return atomicUnitLabelType_5048Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser sequentialUnitNameTypeLblStrict_5059Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSequentialUnitNameTypeLblStrict_5059Parser() {

+		if (sequentialUnitNameTypeLblStrict_5059Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_Type(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			sequentialUnitNameTypeLblStrict_5059Parser = parser;

+		}

+		return sequentialUnitNameTypeLblStrict_5059Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser sequentialUnitNameTypeLblStrict_5058Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSequentialUnitNameTypeLblStrict_5058Parser() {

+		if (sequentialUnitNameTypeLblStrict_5058Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_Type(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			sequentialUnitNameTypeLblStrict_5058Parser = parser;

+		}

+		return sequentialUnitNameTypeLblStrict_5058Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionalUnitNameType_5057Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionalUnitNameType_5057Parser() {

+		if (conditionalUnitNameType_5057Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionalUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			conditionalUnitNameType_5057Parser = parser;

+		}

+		return conditionalUnitNameType_5057Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionalUnitNameType_5056Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionalUnitNameType_5056Parser() {

+		if (conditionalUnitNameType_5056Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionalUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			conditionalUnitNameType_5056Parser = parser;

+		}

+		return conditionalUnitNameType_5056Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser sequentialUnitNameTypeLblStrict_5051Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSequentialUnitNameTypeLblStrict_5051Parser() {

+		if (sequentialUnitNameTypeLblStrict_5051Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_Type(),

+					ComrelPackage.eINSTANCE.getSequentialUnit_LblStrict() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			sequentialUnitNameTypeLblStrict_5051Parser = parser;

+		}

+		return sequentialUnitNameTypeLblStrict_5051Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser atomicUnitLabelType_5050Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAtomicUnitLabelType_5050Parser() {

+		if (atomicUnitLabelType_5050Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getAtomicUnit_Label(),

+					ComrelPackage.eINSTANCE.getAtomicUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			atomicUnitLabelType_5050Parser = parser;

+		}

+		return atomicUnitLabelType_5050Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionalUnitNameType_5055Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionalUnitNameType_5055Parser() {

+		if (conditionalUnitNameType_5055Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionalUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			conditionalUnitNameType_5055Parser = parser;

+		}

+		return conditionalUnitNameType_5055Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser conditionCheckNameTypeSpec_5052Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConditionCheckNameTypeSpec_5052Parser() {

+		if (conditionCheckNameTypeSpec_5052Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getNamedElement_Name(),

+					ComrelPackage.eINSTANCE.getConditionCheck_Type(),

+					ComrelPackage.eINSTANCE.getConditionCheck_Spec() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1} -{2}-"); //$NON-NLS-1$

+			conditionCheckNameTypeSpec_5052Parser = parser;

+		}

+		return conditionCheckNameTypeSpec_5052Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser atomicUnitLabelType_5053Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAtomicUnitLabelType_5053Parser() {

+		if (atomicUnitLabelType_5053Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getAtomicUnit_Label(),

+					ComrelPackage.eINSTANCE.getAtomicUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			atomicUnitLabelType_5053Parser = parser;

+		}

+		return atomicUnitLabelType_5053Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser atomicUnitLabelType_5054Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAtomicUnitLabelType_5054Parser() {

+		if (atomicUnitLabelType_5054Parser == null) {

+			EAttribute[] features = new EAttribute[] {

+					ComrelPackage.eINSTANCE.getAtomicUnit_Label(),

+					ComrelPackage.eINSTANCE.getAtomicUnit_Type() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}:{1}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}:{1}"); //$NON-NLS-1$

+			atomicUnitLabelType_5054Parser = parser;

+		}

+		return atomicUnitLabelType_5054Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IParser getParser(int visualID) {

+		switch (visualID) {

+		case SingleInputPortNameTypeEditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5001Parser();

+		case CartesianQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID:

+			return getCartesianQueuedUnitNameTypeLblStrict_5080Parser();

+		case ParallelQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID:

+			return getParallelQueuedUnitNameTypeLblStrict_5081Parser();

+		case SingleQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID:

+			return getSingleQueuedUnitNameTypeLblStrict_5082Parser();

+		case SequentialUnitNameTypeLblStrictEditPart.VISUAL_ID:

+			return getSequentialUnitNameTypeLblStrict_5083Parser();

+		case ConditionalUnitNameTypeEditPart.VISUAL_ID:

+			return getConditionalUnitNameType_5084Parser();

+		case AtomicUnitLabelTypeEditPart.VISUAL_ID:

+			return getAtomicUnitLabelType_5085Parser();

+		case SingleInputPortNameType2EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5002Parser();

+		case MultiInputPortNameTypeEditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5003Parser();

+		case CartesianQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitNameTypeLblStrict_5079Parser();

+		case ParallelQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+			return getParallelQueuedUnitNameTypeLblStrict_5078Parser();

+		case SingleInputPortNameType3EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5004Parser();

+		case MultiInputPortNameType2EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5005Parser();

+		case CartesianQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitNameTypeLblStrict_5077Parser();

+		case SingleFeatureUnitNameTypeEditPart.VISUAL_ID:

+			return getSingleFeatureUnitNameType_5009Parser();

+		case SingleInputPortNameType4EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5006Parser();

+		case MultiInputPortNameType3EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5007Parser();

+		case SingleOutputPortNameTypeEditPart.VISUAL_ID:

+			return getSingleOutputPortNameType_5008Parser();

+		case MultiFeatureUnitNameTypeEditPart.VISUAL_ID:

+			return getMultiFeatureUnitNameType_5013Parser();

+		case SingleInputPortNameType5EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5010Parser();

+		case MultiInputPortNameType4EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5011Parser();

+		case MultiOutputPortNameTypeEditPart.VISUAL_ID:

+			return getMultiOutputPortNameType_5012Parser();

+		case SingleFilterUnitNameTypeEditPart.VISUAL_ID:

+			return getSingleFilterUnitNameType_5016Parser();

+		case MultiInputPortNameType5EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5014Parser();

+		case SingleOutputPortNameType2EditPart.VISUAL_ID:

+			return getSingleOutputPortNameType_5015Parser();

+		case MultiFilterUnitNameTypeEditPart.VISUAL_ID:

+			return getMultiFilterUnitNameType_5019Parser();

+		case MultiInputPortNameType6EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5017Parser();

+		case MultiOutputPortNameType2EditPart.VISUAL_ID:

+			return getMultiOutputPortNameType_5018Parser();

+		case SingleQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+			return getSingleQueuedUnitNameTypeLblStrict_5076Parser();

+		case SingleInputPortNameType6EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5020Parser();

+		case MultiInputPortNameType7EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5021Parser();

+		case CartesianQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitNameTypeLblStrict_5075Parser();

+		case SequentialUnitNameTypeLblStrict2EditPart.VISUAL_ID:

+			return getSequentialUnitNameTypeLblStrict_5074Parser();

+		case SingleInputPortNameType7EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5022Parser();

+		case MultiInputPortNameType8EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5023Parser();

+		case CartesianQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitNameTypeLblStrict_5073Parser();

+		case ConditionalUnitNameType2EditPart.VISUAL_ID:

+			return getConditionalUnitNameType_5072Parser();

+		case SingleInputPortNameType8EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5024Parser();

+		case MultiInputPortNameType9EditPart.VISUAL_ID:

+			return getMultiInputPortNameType_5025Parser();

+		case CartesianQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitNameTypeLblStrict_5028Parser();

+		case AtomicUnitLabelType2EditPart.VISUAL_ID:

+			return getAtomicUnitLabelType_5027Parser();

+		case SingleInputPortNameType9EditPart.VISUAL_ID:

+			return getSingleInputPortNameType_5026Parser();

+		case ParallelQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+			return getParallelQueuedUnitNameTypeLblStrict_5071Parser();

+		case ParallelQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+			return getParallelQueuedUnitNameTypeLblStrict_5070Parser();

+		case SingleFeatureUnitNameType2EditPart.VISUAL_ID:

+			return getSingleFeatureUnitNameType_5029Parser();

+		case MultiFeatureUnitNameType2EditPart.VISUAL_ID:

+			return getMultiFeatureUnitNameType_5030Parser();

+		case SingleFilterUnitNameType2EditPart.VISUAL_ID:

+			return getSingleFilterUnitNameType_5031Parser();

+		case MultiFilterUnitNameType2EditPart.VISUAL_ID:

+			return getMultiFilterUnitNameType_5032Parser();

+		case SingleQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+			return getSingleQueuedUnitNameTypeLblStrict_5069Parser();

+		case ParallelQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+			return getParallelQueuedUnitNameTypeLblStrict_5068Parser();

+		case SequentialUnitNameTypeLblStrict3EditPart.VISUAL_ID:

+			return getSequentialUnitNameTypeLblStrict_5067Parser();

+		case ParallelQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+			return getParallelQueuedUnitNameTypeLblStrict_5066Parser();

+		case ConditionalUnitNameType3EditPart.VISUAL_ID:

+			return getConditionalUnitNameType_5065Parser();

+		case CartesianQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+			return getCartesianQueuedUnitNameTypeLblStrict_5033Parser();

+		case ParallelQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+			return getParallelQueuedUnitNameTypeLblStrict_5035Parser();

+		case AtomicUnitLabelType3EditPart.VISUAL_ID:

+			return getAtomicUnitLabelType_5034Parser();

+		case SingleFeatureUnitNameType3EditPart.VISUAL_ID:

+			return getSingleFeatureUnitNameType_5036Parser();

+		case MultiFeatureUnitNameType3EditPart.VISUAL_ID:

+			return getMultiFeatureUnitNameType_5037Parser();

+		case SingleFilterUnitNameType3EditPart.VISUAL_ID:

+			return getSingleFilterUnitNameType_5038Parser();

+		case MultiFilterUnitNameType3EditPart.VISUAL_ID:

+			return getMultiFilterUnitNameType_5039Parser();

+		case SingleQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+			return getSingleQueuedUnitNameTypeLblStrict_5064Parser();

+		case SingleFeatureUnitNameType4EditPart.VISUAL_ID:

+			return getSingleFeatureUnitNameType_5040Parser();

+		case MultiFeatureUnitNameType4EditPart.VISUAL_ID:

+			return getMultiFeatureUnitNameType_5041Parser();

+		case SingleFilterUnitNameType4EditPart.VISUAL_ID:

+			return getSingleFilterUnitNameType_5042Parser();

+		case MultiFilterUnitNameType4EditPart.VISUAL_ID:

+			return getMultiFilterUnitNameType_5043Parser();

+		case SingleQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+			return getSingleQueuedUnitNameTypeLblStrict_5063Parser();

+		case SequentialUnitNameTypeLblStrict4EditPart.VISUAL_ID:

+			return getSequentialUnitNameTypeLblStrict_5062Parser();

+		case SingleFeatureUnitNameType5EditPart.VISUAL_ID:

+			return getSingleFeatureUnitNameType_5044Parser();

+		case MultiFeatureUnitNameType5EditPart.VISUAL_ID:

+			return getMultiFeatureUnitNameType_5045Parser();

+		case SingleFilterUnitNameType5EditPart.VISUAL_ID:

+			return getSingleFilterUnitNameType_5046Parser();

+		case MultiFilterUnitNameType5EditPart.VISUAL_ID:

+			return getMultiFilterUnitNameType_5047Parser();

+		case SingleQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+			return getSingleQueuedUnitNameTypeLblStrict_5061Parser();

+		case ConditionalUnitNameType4EditPart.VISUAL_ID:

+			return getConditionalUnitNameType_5060Parser();

+		case SingleQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+			return getSingleQueuedUnitNameTypeLblStrict_5049Parser();

+		case AtomicUnitLabelType4EditPart.VISUAL_ID:

+			return getAtomicUnitLabelType_5048Parser();

+		case SequentialUnitNameTypeLblStrict5EditPart.VISUAL_ID:

+			return getSequentialUnitNameTypeLblStrict_5059Parser();

+		case SequentialUnitNameTypeLblStrict6EditPart.VISUAL_ID:

+			return getSequentialUnitNameTypeLblStrict_5058Parser();

+		case ConditionalUnitNameType5EditPart.VISUAL_ID:

+			return getConditionalUnitNameType_5057Parser();

+		case ConditionalUnitNameType6EditPart.VISUAL_ID:

+			return getConditionalUnitNameType_5056Parser();

+		case SequentialUnitNameTypeLblStrict7EditPart.VISUAL_ID:

+			return getSequentialUnitNameTypeLblStrict_5051Parser();

+		case AtomicUnitLabelType5EditPart.VISUAL_ID:

+			return getAtomicUnitLabelType_5050Parser();

+		case ConditionalUnitNameType7EditPart.VISUAL_ID:

+			return getConditionalUnitNameType_5055Parser();

+		case ConditionCheckNameTypeSpecEditPart.VISUAL_ID:

+			return getConditionCheckNameTypeSpec_5052Parser();

+		case AtomicUnitLabelType6EditPart.VISUAL_ID:

+			return getAtomicUnitLabelType_5053Parser();

+		case AtomicUnitLabelType7EditPart.VISUAL_ID:

+			return getAtomicUnitLabelType_5054Parser();

+		}

+		return null;

+	}

+

+	/**

+	 * Utility method that consults ParserService

+	 * @generated

+	 */

+	public static IParser getParser(IElementType type, EObject object,

+			String parserHint) {

+		return ParserService.getInstance().getParser(

+				new HintAdapter(type, object, parserHint));

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser(IAdaptable hint) {

+		String vid = (String) hint.getAdapter(String.class);

+		if (vid != null) {

+			return getParser(ComrelVisualIDRegistry.getVisualID(vid));

+		}

+		View view = (View) hint.getAdapter(View.class);

+		if (view != null) {

+			return getParser(ComrelVisualIDRegistry.getVisualID(view));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean provides(IOperation operation) {

+		if (operation instanceof GetParserOperation) {

+			IAdaptable hint = ((GetParserOperation) operation).getHint();

+			if (ComrelElementTypes.getElement(hint) == null) {

+				return false;

+			}

+			return getParser(hint) != null;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class HintAdapter extends ParserHintAdapter {

+

+		/**

+		 * @generated

+		 */

+		private final IElementType elementType;

+

+		/**

+		 * @generated

+		 */

+		public HintAdapter(IElementType type, EObject object, String parserHint) {

+			super(object, parserHint);

+			assert type != null;

+			elementType = type;

+		}

+

+		/**

+		 * @generated

+		 */

+		public Object getAdapter(Class adapter) {

+			if (IElementType.class.equals(adapter)) {

+				return elementType;

+			}

+			return super.getAdapter(adapter);

+		}

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelShortcutsDecoratorProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelShortcutsDecoratorProvider.java
new file mode 100644
index 0000000..cc7d0a3
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelShortcutsDecoratorProvider.java
@@ -0,0 +1,102 @@
+/*

+ * 

+ */

+package comrel.diagram.providers;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.gef.EditPart;

+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.editparts.ConnectionEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Image;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelShortcutsDecoratorProvider extends AbstractProvider

+		implements IDecoratorProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final String SHORTCUTS_DECORATOR_ID = "shortcuts"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public boolean provides(IOperation operation) {

+		if (!(operation instanceof CreateDecoratorsOperation)) {

+			return false;

+		}

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation)

+				.getDecoratorTarget();

+		View view = (View) decoratorTarget.getAdapter(View.class);

+		return view != null

+				&& CompositeRefactoringEditPart.MODEL_ID

+						.equals(ComrelVisualIDRegistry.getModelID(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	public void createDecorators(IDecoratorTarget decoratorTarget) {

+		View view = (View) decoratorTarget.getAdapter(View.class);

+		if (view != null) {

+			EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+			if (annotation != null) {

+				decoratorTarget.installDecorator(SHORTCUTS_DECORATOR_ID,

+						new ShortcutsDecorator(decoratorTarget));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected class ShortcutsDecorator extends AbstractDecorator {

+

+		/**

+		 * @generated

+		 */

+		public ShortcutsDecorator(IDecoratorTarget decoratorTarget) {

+			super(decoratorTarget);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void activate() {

+			refresh();

+		}

+

+		/**

+		 * @generated

+		 */

+		public void refresh() {

+			removeDecoration();

+			EditPart editPart = (EditPart) getDecoratorTarget().getAdapter(

+					EditPart.class);

+			Image image = ComrelDiagramEditorPlugin.getInstance()

+					.getBundledImage("icons/shortcut.gif"); //$NON-NLS-1$

+			if (editPart instanceof ShapeEditPart) {

+				setDecoration(getDecoratorTarget().addShapeDecoration(image,

+						IDecoratorTarget.Direction.SOUTH_WEST, 0, false));

+			} else if (editPart instanceof ConnectionEditPart) {

+				setDecoration(getDecoratorTarget().addConnectionDecoration(

+						image, 50, false));

+			}

+		}

+

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelValidationDecoratorProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelValidationDecoratorProvider.java
new file mode 100644
index 0000000..26bf8a8
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelValidationDecoratorProvider.java
@@ -0,0 +1,453 @@
+/*

+ * 

+ */

+package comrel.diagram.providers;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.draw2d.FlowLayout;

+import org.eclipse.draw2d.Label;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditDomain;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.editparts.AbstractConnectionEditPart;

+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.resources.FileChangeManager;

+import org.eclipse.gmf.runtime.common.ui.resources.IFileObserver;

+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

+import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.ISharedImages;

+import org.eclipse.ui.PlatformUI;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.part.ComrelDiagramEditor;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelValidationDecoratorProvider extends AbstractProvider

+		implements IDecoratorProvider {

+

+	/**

+	 * @generated

+	 */

+	private static final String KEY = "validationStatus"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private static final String MARKER_TYPE = ComrelDiagramEditorPlugin.ID

+			+ ".diagnostic"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private static MarkerObserver fileObserver;

+

+	/**

+	 * @generated

+	 */

+	private static Map/*<String, List<IDecorator>>*/allDecorators = new HashMap();

+

+	/**

+	 * @generated

+	 */

+	public void createDecorators(IDecoratorTarget decoratorTarget) {

+		EditPart editPart = (EditPart) decoratorTarget

+				.getAdapter(EditPart.class);

+		if (editPart instanceof GraphicalEditPart

+				|| editPart instanceof AbstractConnectionEditPart) {

+			Object model = editPart.getModel();

+			if ((model instanceof View)) {

+				View view = (View) model;

+				if (!(view instanceof Edge) && !view.isSetElement()) {

+					return;

+				}

+			}

+			EditDomain ed = editPart.getViewer().getEditDomain();

+			if (!(ed instanceof DiagramEditDomain)) {

+				return;

+			}

+			if (((DiagramEditDomain) ed).getEditorPart() instanceof ComrelDiagramEditor) {

+				decoratorTarget.installDecorator(KEY, new StatusDecorator(

+						decoratorTarget));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean provides(IOperation operation) {

+		if (!(operation instanceof CreateDecoratorsOperation)) {

+			return false;

+		}

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation)

+				.getDecoratorTarget();

+		View view = (View) decoratorTarget.getAdapter(View.class);

+		return view != null

+				&& CompositeRefactoringEditPart.MODEL_ID

+						.equals(ComrelVisualIDRegistry.getModelID(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void refreshDecorators(View view) {

+		refreshDecorators(ViewUtil.getIdStr(view), view.getDiagram());

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void refreshDecorators(String viewId, Diagram diagram) {

+		final List decorators = viewId != null ? (List) allDecorators

+				.get(viewId) : null;

+		if (decorators == null || decorators.isEmpty() || diagram == null) {

+			return;

+		}

+		final Diagram fdiagram = diagram;

+		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {

+

+			public void run() {

+				try {

+					TransactionUtil.getEditingDomain(fdiagram).runExclusive(

+							new Runnable() {

+

+								public void run() {

+									for (Iterator it = decorators.iterator(); it

+											.hasNext();) {

+										IDecorator decorator = (IDecorator) it

+												.next();

+										decorator.refresh();

+									}

+								}

+							});

+				} catch (Exception e) {

+					ComrelDiagramEditorPlugin.getInstance().logError(

+							"Decorator refresh failure", e); //$NON-NLS-1$

+				}

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	public static class StatusDecorator extends AbstractDecorator {

+

+		/**

+		 * @generated

+		 */

+		private String viewId;

+

+		/**

+		 * @generated

+		 */

+		public StatusDecorator(IDecoratorTarget decoratorTarget) {

+			super(decoratorTarget);

+			try {

+				final View view = (View) getDecoratorTarget().getAdapter(

+						View.class);

+				TransactionUtil.getEditingDomain(view).runExclusive(

+						new Runnable() {

+

+							public void run() {

+								StatusDecorator.this.viewId = view != null ? ViewUtil

+										.getIdStr(view) : null;

+							}

+						});

+			} catch (Exception e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"ViewID access failure", e); //$NON-NLS-1$			

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		public void refresh() {

+			removeDecoration();

+			View view = (View) getDecoratorTarget().getAdapter(View.class);

+			if (view == null || view.eResource() == null) {

+				return;

+			}

+			EditPart editPart = (EditPart) getDecoratorTarget().getAdapter(

+					EditPart.class);

+			if (editPart == null || editPart.getViewer() == null) {

+				return;

+			}

+

+			// query for all the validation markers of the current resource

+			String elementId = ViewUtil.getIdStr(view);

+			if (elementId == null) {

+				return;

+			}

+			int severity = IMarker.SEVERITY_INFO;

+			IMarker foundMarker = null;

+			IResource resource = WorkspaceSynchronizer

+					.getFile(view.eResource());

+			if (resource == null || !resource.exists()) {

+				return;

+			}

+			IMarker[] markers = null;

+			try {

+				markers = resource.findMarkers(MARKER_TYPE, true,

+						IResource.DEPTH_INFINITE);

+			} catch (CoreException e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Validation markers refresh failure", e); //$NON-NLS-1$

+			}

+			if (markers == null || markers.length == 0) {

+				return;

+			}

+			Label toolTip = null;

+			for (int i = 0; i < markers.length; i++) {

+				IMarker marker = markers[i];

+				String attribute = marker

+						.getAttribute(

+								org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID,

+								""); //$NON-NLS-1$

+				if (attribute.equals(elementId)) {

+					int nextSeverity = marker.getAttribute(IMarker.SEVERITY,

+							IMarker.SEVERITY_INFO);

+					Image nextImage = getImage(nextSeverity);

+					if (foundMarker == null) {

+						foundMarker = marker;

+						toolTip = new Label(marker.getAttribute(

+								IMarker.MESSAGE, ""), //$NON-NLS-1$

+								nextImage);

+					} else {

+						if (toolTip.getChildren().isEmpty()) {

+							Label comositeLabel = new Label();

+							FlowLayout fl = new FlowLayout(false);

+							fl.setMinorSpacing(0);

+							comositeLabel.setLayoutManager(fl);

+							comositeLabel.add(toolTip);

+							toolTip = comositeLabel;

+						}

+						toolTip.add(new Label(marker.getAttribute(

+								IMarker.MESSAGE, ""), //$NON-NLS-1$

+								nextImage));

+					}

+					severity = (nextSeverity > severity) ? nextSeverity

+							: severity;

+				}

+			}

+			if (foundMarker == null) {

+				return;

+			}

+

+			// add decoration

+			if (editPart instanceof org.eclipse.gef.GraphicalEditPart) {

+				if (view instanceof Edge) {

+					setDecoration(getDecoratorTarget().addConnectionDecoration(

+							getImage(severity), 50, true));

+				} else {

+					int margin = -1;

+					if (editPart instanceof org.eclipse.gef.GraphicalEditPart) {

+						margin = MapModeUtil.getMapMode(

+								((org.eclipse.gef.GraphicalEditPart) editPart)

+										.getFigure()).DPtoLP(margin);

+					}

+					setDecoration(getDecoratorTarget()

+							.addShapeDecoration(getImage(severity),

+									IDecoratorTarget.Direction.NORTH_EAST,

+									margin, true));

+				}

+				getDecoration().setToolTip(toolTip);

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		private Image getImage(int severity) {

+			String imageName = ISharedImages.IMG_OBJS_ERROR_TSK;

+			switch (severity) {

+			case IMarker.SEVERITY_ERROR:

+				imageName = ISharedImages.IMG_OBJS_ERROR_TSK;

+				break;

+			case IMarker.SEVERITY_WARNING:

+				imageName = ISharedImages.IMG_OBJS_WARN_TSK;

+				break;

+			default:

+				imageName = ISharedImages.IMG_OBJS_INFO_TSK;

+			}

+			return PlatformUI.getWorkbench().getSharedImages()

+					.getImage(imageName);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void activate() {

+			if (viewId == null) {

+				return;

+			}

+

+			// add self to global decorators registry

+			List list = (List) allDecorators.get(viewId);

+			if (list == null) {

+				list = new ArrayList(2);

+				list.add(this);

+				allDecorators.put(viewId, list);

+			} else if (!list.contains(this)) {

+				list.add(this);

+			}

+

+			// start listening to changes in resources

+			View view = (View) getDecoratorTarget().getAdapter(View.class);

+			if (view == null) {

+				return;

+			}

+			Diagram diagramView = view.getDiagram();

+			if (diagramView == null) {

+				return;

+			}

+			if (fileObserver == null) {

+				FileChangeManager.getInstance().addFileObserver(

+						fileObserver = new MarkerObserver(diagramView));

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		public void deactivate() {

+			if (viewId == null) {

+				return;

+			}

+

+			// remove self from global decorators registry

+			List list = (List) allDecorators.get(viewId);

+			if (list != null) {

+				list.remove(this);

+				if (list.isEmpty()) {

+					allDecorators.remove(viewId);

+				}

+			}

+

+			// stop listening to changes in resources if there are no more decorators

+			if (fileObserver != null && allDecorators.isEmpty()) {

+				FileChangeManager.getInstance()

+						.removeFileObserver(fileObserver);

+				fileObserver = null;

+			}

+			super.deactivate();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	static class MarkerObserver implements IFileObserver {

+

+		/**

+		 * @generated

+		 */

+		private Diagram diagram;

+

+		/**

+		 * @generated

+		 */

+		private MarkerObserver(Diagram diagram) {

+			this.diagram = diagram;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void handleFileRenamed(IFile oldFile, IFile file) {

+		}

+

+		/**

+		 * @generated

+		 */

+		public void handleFileMoved(IFile oldFile, IFile file) {

+		}

+

+		/**

+		 * @generated

+		 */

+		public void handleFileDeleted(IFile file) {

+		}

+

+		/**

+		 * @generated

+		 */

+		public void handleFileChanged(IFile file) {

+		}

+

+		/**

+		 * @generated

+		 */

+		public void handleMarkerAdded(IMarker marker) {

+			if (marker

+					.getAttribute(

+							org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID,

+							null) != null) {

+				handleMarkerChanged(marker);

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		public void handleMarkerDeleted(IMarker marker, Map attributes) {

+			String viewId = (String) attributes

+					.get(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID);

+			refreshDecorators(viewId, diagram);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void handleMarkerChanged(IMarker marker) {

+			if (!MARKER_TYPE.equals(getType(marker))) {

+				return;

+			}

+			String viewId = marker

+					.getAttribute(

+							org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID,

+							""); //$NON-NLS-1$

+			refreshDecorators(viewId, diagram);

+		}

+

+		/**

+		 * @generated

+		 */

+		private String getType(IMarker marker) {

+			try {

+				return marker.getType();

+			} catch (CoreException e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Validation marker refresh failure", e); //$NON-NLS-1$

+				return ""; //$NON-NLS-1$

+			}

+		}

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelValidationProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelValidationProvider.java
new file mode 100644
index 0000000..4870422
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelValidationProvider.java
@@ -0,0 +1,74 @@
+/*

+ * 

+ */

+package comrel.diagram.providers;

+

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.notation.View;

+

+import comrel.diagram.edit.parts.CompositeRefactoringEditPart;

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelValidationProvider {

+

+	/**

+	 * @generated

+	 */

+	private static boolean constraintsActive = false;

+

+	/**

+	 * @generated

+	 */

+	public static boolean shouldConstraintsBePrivate() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runWithConstraints(

+			TransactionalEditingDomain editingDomain, Runnable operation) {

+		final Runnable op = operation;

+		Runnable task = new Runnable() {

+			public void run() {

+				try {

+					constraintsActive = true;

+					op.run();

+				} finally {

+					constraintsActive = false;

+				}

+			}

+		};

+		if (editingDomain != null) {

+			try {

+				editingDomain.runExclusive(task);

+			} catch (Exception e) {

+				ComrelDiagramEditorPlugin.getInstance().logError(

+						"Validation failed", e); //$NON-NLS-1$

+			}

+		} else {

+			task.run();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	static boolean isInDefaultEditorContext(Object object) {

+		if (shouldConstraintsBePrivate() && !constraintsActive) {

+			return false;

+		}

+		if (object instanceof View) {

+			return constraintsActive

+					&& CompositeRefactoringEditPart.MODEL_ID

+							.equals(ComrelVisualIDRegistry

+									.getModelID((View) object));

+		}

+		return true;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelViewProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelViewProvider.java
new file mode 100644
index 0000000..f386ab9
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ComrelViewProvider.java
@@ -0,0 +1,5431 @@
+/*

+ * 

+ */

+package comrel.diagram.providers;

+

+import java.util.ArrayList;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EcoreFactory;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

+import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+import org.eclipse.gmf.runtime.notation.Connector;

+import org.eclipse.gmf.runtime.notation.DecorationNode;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.Location;

+import org.eclipse.gmf.runtime.notation.MeasurementUnit;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.NotationFactory;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.RelativeBendpoints;

+import org.eclipse.gmf.runtime.notation.Routing;

+import org.eclipse.gmf.runtime.notation.Shape;

+import org.eclipse.gmf.runtime.notation.TitleStyle;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.FontData;

+

+import comrel.diagram.edit.parts.*;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class ComrelViewProvider extends AbstractProvider implements

+		IViewProvider {

+

+	/**

+	 * @generated

+	 */

+	public final boolean provides(IOperation operation) {

+		if (operation instanceof CreateViewForKindOperation) {

+			return provides((CreateViewForKindOperation) operation);

+		}

+		assert operation instanceof CreateViewOperation;

+		if (operation instanceof CreateDiagramViewOperation) {

+			return provides((CreateDiagramViewOperation) operation);

+		} else if (operation instanceof CreateEdgeViewOperation) {

+			return provides((CreateEdgeViewOperation) operation);

+		} else if (operation instanceof CreateNodeViewOperation) {

+			return provides((CreateNodeViewOperation) operation);

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean provides(CreateViewForKindOperation op) {

+		/*

+		 if (op.getViewKind() == Node.class)

+		 return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		 if (op.getViewKind() == Edge.class)

+		 return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		 */

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean provides(CreateDiagramViewOperation op) {

+		return CompositeRefactoringEditPart.MODEL_ID.equals(op

+				.getSemanticHint())

+				&& ComrelVisualIDRegistry

+						.getDiagramVisualID(getSemanticElement(op

+								.getSemanticAdapter())) != -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean provides(CreateNodeViewOperation op) {

+		if (op.getContainerView() == null) {

+			return false;

+		}

+		IElementType elementType = getSemanticElementType(op

+				.getSemanticAdapter());

+		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		int visualID;

+		if (op.getSemanticHint() == null) {

+			// Semantic hint is not specified. Can be a result of call from CanonicalEditPolicy.

+			// In this situation there should be NO elementType, visualID will be determined

+			// by VisualIDRegistry.getNodeVisualID() for domainElement.

+			if (elementType != null || domainElement == null) {

+				return false;

+			}

+			visualID = ComrelVisualIDRegistry.getNodeVisualID(

+					op.getContainerView(), domainElement);

+		} else {

+			visualID = ComrelVisualIDRegistry.getVisualID(op.getSemanticHint());

+			if (elementType != null) {

+				if (!ComrelElementTypes.isKnownElementType(elementType)

+						|| (!(elementType instanceof IHintedType))) {

+					return false; // foreign element type

+				}

+				String elementTypeHint = ((IHintedType) elementType)

+						.getSemanticHint();

+				if (!op.getSemanticHint().equals(elementTypeHint)) {

+					return false; // if semantic hint is specified it should be the same as in element type

+				}

+				if (domainElement != null

+						&& visualID != ComrelVisualIDRegistry.getNodeVisualID(

+								op.getContainerView(), domainElement)) {

+					return false; // visual id for node EClass should match visual id from element type

+				}

+			} else {

+				if (!CompositeRefactoringEditPart.MODEL_ID

+						.equals(ComrelVisualIDRegistry.getModelID(op

+								.getContainerView()))) {

+					return false; // foreign diagram

+				}

+				switch (visualID) {

+				case SingleInputPortEditPart.VISUAL_ID:

+				case CartesianQueuedUnitEditPart.VISUAL_ID:

+				case MultiInputPortEditPart.VISUAL_ID:

+				case ParallelQueuedUnit2EditPart.VISUAL_ID:

+				case SingleFeatureUnitEditPart.VISUAL_ID:

+				case SingleOutputPortEditPart.VISUAL_ID:

+				case MultiFeatureUnitEditPart.VISUAL_ID:

+				case MultiOutputPortEditPart.VISUAL_ID:

+				case SingleFilterUnitEditPart.VISUAL_ID:

+				case MultiFilterUnitEditPart.VISUAL_ID:

+				case SingleQueuedUnit2EditPart.VISUAL_ID:

+				case SequentialUnit2EditPart.VISUAL_ID:

+				case ConditionalUnit2EditPart.VISUAL_ID:

+				case AtomicUnit2EditPart.VISUAL_ID:

+				case ConditionCheckEditPart.VISUAL_ID:

+				case ParallelQueuedUnitEditPart.VISUAL_ID:

+				case SingleQueuedUnitEditPart.VISUAL_ID:

+				case SequentialUnitEditPart.VISUAL_ID:

+				case ConditionalUnitEditPart.VISUAL_ID:

+				case AtomicUnitEditPart.VISUAL_ID:

+				case SingleInputPort2EditPart.VISUAL_ID:

+				case CartesianQueuedUnit2EditPart.VISUAL_ID:

+				case SingleInputPort3EditPart.VISUAL_ID:

+				case MultiInputPort2EditPart.VISUAL_ID:

+				case CartesianQueuedUnit3EditPart.VISUAL_ID:

+				case SingleInputPort4EditPart.VISUAL_ID:

+				case MultiInputPort3EditPart.VISUAL_ID:

+				case SingleInputPort5EditPart.VISUAL_ID:

+				case MultiInputPort4EditPart.VISUAL_ID:

+				case MultiInputPort5EditPart.VISUAL_ID:

+				case SingleOutputPort2EditPart.VISUAL_ID:

+				case MultiInputPort6EditPart.VISUAL_ID:

+				case MultiOutputPort2EditPart.VISUAL_ID:

+				case SingleInputPort6EditPart.VISUAL_ID:

+				case MultiInputPort7EditPart.VISUAL_ID:

+				case CartesianQueuedUnit4EditPart.VISUAL_ID:

+				case SingleInputPort7EditPart.VISUAL_ID:

+				case MultiInputPort8EditPart.VISUAL_ID:

+				case CartesianQueuedUnit5EditPart.VISUAL_ID:

+				case SingleInputPort8EditPart.VISUAL_ID:

+				case MultiInputPort9EditPart.VISUAL_ID:

+				case CartesianQueuedUnit6EditPart.VISUAL_ID:

+				case SingleInputPort9EditPart.VISUAL_ID:

+				case ParallelQueuedUnit3EditPart.VISUAL_ID:

+				case ParallelQueuedUnit4EditPart.VISUAL_ID:

+				case SingleFeatureUnit2EditPart.VISUAL_ID:

+				case MultiFeatureUnit2EditPart.VISUAL_ID:

+				case SingleFilterUnit2EditPart.VISUAL_ID:

+				case MultiFilterUnit2EditPart.VISUAL_ID:

+				case SingleQueuedUnit3EditPart.VISUAL_ID:

+				case ParallelQueuedUnit5EditPart.VISUAL_ID:

+				case SequentialUnit3EditPart.VISUAL_ID:

+				case ParallelQueuedUnit6EditPart.VISUAL_ID:

+				case ConditionalUnit3EditPart.VISUAL_ID:

+				case CartesianQueuedUnit7EditPart.VISUAL_ID:

+				case ParallelQueuedUnit7EditPart.VISUAL_ID:

+				case AtomicUnit3EditPart.VISUAL_ID:

+				case SingleFeatureUnit3EditPart.VISUAL_ID:

+				case MultiFeatureUnit3EditPart.VISUAL_ID:

+				case SingleFilterUnit3EditPart.VISUAL_ID:

+				case MultiFilterUnit3EditPart.VISUAL_ID:

+				case SingleQueuedUnit4EditPart.VISUAL_ID:

+				case SingleFeatureUnit4EditPart.VISUAL_ID:

+				case MultiFeatureUnit4EditPart.VISUAL_ID:

+				case SingleFilterUnit4EditPart.VISUAL_ID:

+				case MultiFilterUnit4EditPart.VISUAL_ID:

+				case SingleQueuedUnit5EditPart.VISUAL_ID:

+				case SequentialUnit4EditPart.VISUAL_ID:

+				case SingleFeatureUnit5EditPart.VISUAL_ID:

+				case MultiFeatureUnit5EditPart.VISUAL_ID:

+				case SingleFilterUnit5EditPart.VISUAL_ID:

+				case MultiFilterUnit5EditPart.VISUAL_ID:

+				case SingleQueuedUnit6EditPart.VISUAL_ID:

+				case ConditionalUnit4EditPart.VISUAL_ID:

+				case SingleQueuedUnit7EditPart.VISUAL_ID:

+				case AtomicUnit4EditPart.VISUAL_ID:

+				case SequentialUnit5EditPart.VISUAL_ID:

+				case SequentialUnit6EditPart.VISUAL_ID:

+				case ConditionalUnit5EditPart.VISUAL_ID:

+				case ConditionalUnit6EditPart.VISUAL_ID:

+				case SequentialUnit7EditPart.VISUAL_ID:

+				case AtomicUnit5EditPart.VISUAL_ID:

+				case ConditionalUnit7EditPart.VISUAL_ID:

+				case AtomicUnit6EditPart.VISUAL_ID:

+				case AtomicUnit7EditPart.VISUAL_ID:

+					if (domainElement == null

+							|| visualID != ComrelVisualIDRegistry

+									.getNodeVisualID(op.getContainerView(),

+											domainElement)) {

+						return false; // visual id in semantic hint should match visual id for domain element

+					}

+					break;

+				default:

+					return false;

+				}

+			}

+		}

+		return SingleInputPortEditPart.VISUAL_ID == visualID

+				|| CartesianQueuedUnitEditPart.VISUAL_ID == visualID

+				|| ParallelQueuedUnitEditPart.VISUAL_ID == visualID

+				|| SingleQueuedUnitEditPart.VISUAL_ID == visualID

+				|| SequentialUnitEditPart.VISUAL_ID == visualID

+				|| ConditionalUnitEditPart.VISUAL_ID == visualID

+				|| AtomicUnitEditPart.VISUAL_ID == visualID

+				|| SingleInputPort2EditPart.VISUAL_ID == visualID

+				|| MultiInputPortEditPart.VISUAL_ID == visualID

+				|| CartesianQueuedUnit2EditPart.VISUAL_ID == visualID

+				|| ParallelQueuedUnit2EditPart.VISUAL_ID == visualID

+				|| SingleInputPort3EditPart.VISUAL_ID == visualID

+				|| MultiInputPort2EditPart.VISUAL_ID == visualID

+				|| CartesianQueuedUnit3EditPart.VISUAL_ID == visualID

+				|| SingleFeatureUnitEditPart.VISUAL_ID == visualID

+				|| SingleInputPort4EditPart.VISUAL_ID == visualID

+				|| MultiInputPort3EditPart.VISUAL_ID == visualID

+				|| SingleOutputPortEditPart.VISUAL_ID == visualID

+				|| MultiFeatureUnitEditPart.VISUAL_ID == visualID

+				|| SingleInputPort5EditPart.VISUAL_ID == visualID

+				|| MultiInputPort4EditPart.VISUAL_ID == visualID

+				|| MultiOutputPortEditPart.VISUAL_ID == visualID

+				|| SingleFilterUnitEditPart.VISUAL_ID == visualID

+				|| MultiInputPort5EditPart.VISUAL_ID == visualID

+				|| SingleOutputPort2EditPart.VISUAL_ID == visualID

+				|| MultiFilterUnitEditPart.VISUAL_ID == visualID

+				|| MultiInputPort6EditPart.VISUAL_ID == visualID

+				|| MultiOutputPort2EditPart.VISUAL_ID == visualID

+				|| SingleQueuedUnit2EditPart.VISUAL_ID == visualID

+				|| SingleInputPort6EditPart.VISUAL_ID == visualID

+				|| MultiInputPort7EditPart.VISUAL_ID == visualID

+				|| CartesianQueuedUnit4EditPart.VISUAL_ID == visualID

+				|| SequentialUnit2EditPart.VISUAL_ID == visualID

+				|| SingleInputPort7EditPart.VISUAL_ID == visualID

+				|| MultiInputPort8EditPart.VISUAL_ID == visualID

+				|| CartesianQueuedUnit5EditPart.VISUAL_ID == visualID

+				|| ConditionalUnit2EditPart.VISUAL_ID == visualID

+				|| SingleInputPort8EditPart.VISUAL_ID == visualID

+				|| MultiInputPort9EditPart.VISUAL_ID == visualID

+				|| CartesianQueuedUnit6EditPart.VISUAL_ID == visualID

+				|| AtomicUnit2EditPart.VISUAL_ID == visualID

+				|| SingleInputPort9EditPart.VISUAL_ID == visualID

+				|| ParallelQueuedUnit3EditPart.VISUAL_ID == visualID

+				|| ParallelQueuedUnit4EditPart.VISUAL_ID == visualID

+				|| SingleFeatureUnit2EditPart.VISUAL_ID == visualID

+				|| MultiFeatureUnit2EditPart.VISUAL_ID == visualID

+				|| SingleFilterUnit2EditPart.VISUAL_ID == visualID

+				|| MultiFilterUnit2EditPart.VISUAL_ID == visualID

+				|| SingleQueuedUnit3EditPart.VISUAL_ID == visualID

+				|| ParallelQueuedUnit5EditPart.VISUAL_ID == visualID

+				|| SequentialUnit3EditPart.VISUAL_ID == visualID

+				|| ParallelQueuedUnit6EditPart.VISUAL_ID == visualID

+				|| ConditionalUnit3EditPart.VISUAL_ID == visualID

+				|| CartesianQueuedUnit7EditPart.VISUAL_ID == visualID

+				|| ParallelQueuedUnit7EditPart.VISUAL_ID == visualID

+				|| AtomicUnit3EditPart.VISUAL_ID == visualID

+				|| SingleFeatureUnit3EditPart.VISUAL_ID == visualID

+				|| MultiFeatureUnit3EditPart.VISUAL_ID == visualID

+				|| SingleFilterUnit3EditPart.VISUAL_ID == visualID

+				|| MultiFilterUnit3EditPart.VISUAL_ID == visualID

+				|| SingleQueuedUnit4EditPart.VISUAL_ID == visualID

+				|| SingleFeatureUnit4EditPart.VISUAL_ID == visualID

+				|| MultiFeatureUnit4EditPart.VISUAL_ID == visualID

+				|| SingleFilterUnit4EditPart.VISUAL_ID == visualID

+				|| MultiFilterUnit4EditPart.VISUAL_ID == visualID

+				|| SingleQueuedUnit5EditPart.VISUAL_ID == visualID

+				|| SequentialUnit4EditPart.VISUAL_ID == visualID

+				|| SingleFeatureUnit5EditPart.VISUAL_ID == visualID

+				|| MultiFeatureUnit5EditPart.VISUAL_ID == visualID

+				|| SingleFilterUnit5EditPart.VISUAL_ID == visualID

+				|| MultiFilterUnit5EditPart.VISUAL_ID == visualID

+				|| SingleQueuedUnit6EditPart.VISUAL_ID == visualID

+				|| ConditionalUnit4EditPart.VISUAL_ID == visualID

+				|| SingleQueuedUnit7EditPart.VISUAL_ID == visualID

+				|| AtomicUnit4EditPart.VISUAL_ID == visualID

+				|| SequentialUnit5EditPart.VISUAL_ID == visualID

+				|| SequentialUnit6EditPart.VISUAL_ID == visualID

+				|| ConditionalUnit5EditPart.VISUAL_ID == visualID

+				|| ConditionalUnit6EditPart.VISUAL_ID == visualID

+				|| SequentialUnit7EditPart.VISUAL_ID == visualID

+				|| AtomicUnit5EditPart.VISUAL_ID == visualID

+				|| ConditionalUnit7EditPart.VISUAL_ID == visualID

+				|| ConditionCheckEditPart.VISUAL_ID == visualID

+				|| AtomicUnit6EditPart.VISUAL_ID == visualID

+				|| AtomicUnit7EditPart.VISUAL_ID == visualID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean provides(CreateEdgeViewOperation op) {

+		IElementType elementType = getSemanticElementType(op

+				.getSemanticAdapter());

+		if (!ComrelElementTypes.isKnownElementType(elementType)

+				|| (!(elementType instanceof IHintedType))) {

+			return false; // foreign element type

+		}

+		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

+		if (elementTypeHint == null

+				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op

+						.getSemanticHint()))) {

+			return false; // our hint is visual id and must be specified, and it should be the same as in element type

+		}

+		int visualID = ComrelVisualIDRegistry.getVisualID(elementTypeHint);

+		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		if (domainElement != null

+				&& visualID != ComrelVisualIDRegistry

+						.getLinkWithClassVisualID(domainElement)) {

+			return false; // visual id for link EClass should match visual id from element type

+		}

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Diagram createDiagram(IAdaptable semanticAdapter,

+			String diagramKind, PreferencesHint preferencesHint) {

+		Diagram diagram = NotationFactory.eINSTANCE.createDiagram();

+		diagram.getStyles().add(NotationFactory.eINSTANCE.createDiagramStyle());

+		diagram.setType(CompositeRefactoringEditPart.MODEL_ID);

+		diagram.setElement(getSemanticElement(semanticAdapter));

+		diagram.setMeasurementUnit(MeasurementUnit.PIXEL_LITERAL);

+		return diagram;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createNode(IAdaptable semanticAdapter, View containerView,

+			String semanticHint, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		final EObject domainElement = getSemanticElement(semanticAdapter);

+		final int visualID;

+		if (semanticHint == null) {

+			visualID = ComrelVisualIDRegistry.getNodeVisualID(containerView,

+					domainElement);

+		} else {

+			visualID = ComrelVisualIDRegistry.getVisualID(semanticHint);

+		}

+		switch (visualID) {

+		case SingleInputPortEditPart.VISUAL_ID:

+			return createSingleInputPort_2001(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case CartesianQueuedUnitEditPart.VISUAL_ID:

+			return createCartesianQueuedUnit_2002(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ParallelQueuedUnitEditPart.VISUAL_ID:

+			return createParallelQueuedUnit_2003(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleQueuedUnitEditPart.VISUAL_ID:

+			return createSingleQueuedUnit_2004(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SequentialUnitEditPart.VISUAL_ID:

+			return createSequentialUnit_2005(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ConditionalUnitEditPart.VISUAL_ID:

+			return createConditionalUnit_2006(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case AtomicUnitEditPart.VISUAL_ID:

+			return createAtomicUnit_2007(domainElement, containerView, index,

+					persisted, preferencesHint);

+		case SingleInputPort2EditPart.VISUAL_ID:

+			return createSingleInputPort_3001(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPortEditPart.VISUAL_ID:

+			return createMultiInputPort_3002(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case CartesianQueuedUnit2EditPart.VISUAL_ID:

+			return createCartesianQueuedUnit_3003(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ParallelQueuedUnit2EditPart.VISUAL_ID:

+			return createParallelQueuedUnit_3004(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleInputPort3EditPart.VISUAL_ID:

+			return createSingleInputPort_3005(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort2EditPart.VISUAL_ID:

+			return createMultiInputPort_3006(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case CartesianQueuedUnit3EditPart.VISUAL_ID:

+			return createCartesianQueuedUnit_3007(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFeatureUnitEditPart.VISUAL_ID:

+			return createSingleFeatureUnit_3008(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleInputPort4EditPart.VISUAL_ID:

+			return createSingleInputPort_3009(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort3EditPart.VISUAL_ID:

+			return createMultiInputPort_3010(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleOutputPortEditPart.VISUAL_ID:

+			return createSingleOutputPort_3011(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFeatureUnitEditPart.VISUAL_ID:

+			return createMultiFeatureUnit_3012(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleInputPort5EditPart.VISUAL_ID:

+			return createSingleInputPort_3013(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort4EditPart.VISUAL_ID:

+			return createMultiInputPort_3014(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiOutputPortEditPart.VISUAL_ID:

+			return createMultiOutputPort_3015(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFilterUnitEditPart.VISUAL_ID:

+			return createSingleFilterUnit_3016(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort5EditPart.VISUAL_ID:

+			return createMultiInputPort_3017(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleOutputPort2EditPart.VISUAL_ID:

+			return createSingleOutputPort_3018(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFilterUnitEditPart.VISUAL_ID:

+			return createMultiFilterUnit_3019(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort6EditPart.VISUAL_ID:

+			return createMultiInputPort_3020(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiOutputPort2EditPart.VISUAL_ID:

+			return createMultiOutputPort_3021(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleQueuedUnit2EditPart.VISUAL_ID:

+			return createSingleQueuedUnit_3022(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleInputPort6EditPart.VISUAL_ID:

+			return createSingleInputPort_3023(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort7EditPart.VISUAL_ID:

+			return createMultiInputPort_3024(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case CartesianQueuedUnit4EditPart.VISUAL_ID:

+			return createCartesianQueuedUnit_3025(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SequentialUnit2EditPart.VISUAL_ID:

+			return createSequentialUnit_3026(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleInputPort7EditPart.VISUAL_ID:

+			return createSingleInputPort_3027(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort8EditPart.VISUAL_ID:

+			return createMultiInputPort_3028(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case CartesianQueuedUnit5EditPart.VISUAL_ID:

+			return createCartesianQueuedUnit_3029(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ConditionalUnit2EditPart.VISUAL_ID:

+			return createConditionalUnit_3030(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleInputPort8EditPart.VISUAL_ID:

+			return createSingleInputPort_3031(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiInputPort9EditPart.VISUAL_ID:

+			return createMultiInputPort_3032(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case CartesianQueuedUnit6EditPart.VISUAL_ID:

+			return createCartesianQueuedUnit_3033(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case AtomicUnit2EditPart.VISUAL_ID:

+			return createAtomicUnit_3034(domainElement, containerView, index,

+					persisted, preferencesHint);

+		case SingleInputPort9EditPart.VISUAL_ID:

+			return createSingleInputPort_3035(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ParallelQueuedUnit3EditPart.VISUAL_ID:

+			return createParallelQueuedUnit_3036(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ParallelQueuedUnit4EditPart.VISUAL_ID:

+			return createParallelQueuedUnit_3037(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFeatureUnit2EditPart.VISUAL_ID:

+			return createSingleFeatureUnit_3038(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFeatureUnit2EditPart.VISUAL_ID:

+			return createMultiFeatureUnit_3039(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFilterUnit2EditPart.VISUAL_ID:

+			return createSingleFilterUnit_3040(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFilterUnit2EditPart.VISUAL_ID:

+			return createMultiFilterUnit_3041(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleQueuedUnit3EditPart.VISUAL_ID:

+			return createSingleQueuedUnit_3042(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ParallelQueuedUnit5EditPart.VISUAL_ID:

+			return createParallelQueuedUnit_3043(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SequentialUnit3EditPart.VISUAL_ID:

+			return createSequentialUnit_3044(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ParallelQueuedUnit6EditPart.VISUAL_ID:

+			return createParallelQueuedUnit_3045(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ConditionalUnit3EditPart.VISUAL_ID:

+			return createConditionalUnit_3046(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case CartesianQueuedUnit7EditPart.VISUAL_ID:

+			return createCartesianQueuedUnit_3047(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ParallelQueuedUnit7EditPart.VISUAL_ID:

+			return createParallelQueuedUnit_3048(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case AtomicUnit3EditPart.VISUAL_ID:

+			return createAtomicUnit_3049(domainElement, containerView, index,

+					persisted, preferencesHint);

+		case SingleFeatureUnit3EditPart.VISUAL_ID:

+			return createSingleFeatureUnit_3050(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFeatureUnit3EditPart.VISUAL_ID:

+			return createMultiFeatureUnit_3051(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFilterUnit3EditPart.VISUAL_ID:

+			return createSingleFilterUnit_3052(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFilterUnit3EditPart.VISUAL_ID:

+			return createMultiFilterUnit_3053(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleQueuedUnit4EditPart.VISUAL_ID:

+			return createSingleQueuedUnit_3054(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFeatureUnit4EditPart.VISUAL_ID:

+			return createSingleFeatureUnit_3055(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFeatureUnit4EditPart.VISUAL_ID:

+			return createMultiFeatureUnit_3056(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFilterUnit4EditPart.VISUAL_ID:

+			return createSingleFilterUnit_3057(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFilterUnit4EditPart.VISUAL_ID:

+			return createMultiFilterUnit_3058(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleQueuedUnit5EditPart.VISUAL_ID:

+			return createSingleQueuedUnit_3059(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SequentialUnit4EditPart.VISUAL_ID:

+			return createSequentialUnit_3060(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFeatureUnit5EditPart.VISUAL_ID:

+			return createSingleFeatureUnit_3061(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFeatureUnit5EditPart.VISUAL_ID:

+			return createMultiFeatureUnit_3062(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleFilterUnit5EditPart.VISUAL_ID:

+			return createSingleFilterUnit_3063(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case MultiFilterUnit5EditPart.VISUAL_ID:

+			return createMultiFilterUnit_3064(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleQueuedUnit6EditPart.VISUAL_ID:

+			return createSingleQueuedUnit_3065(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ConditionalUnit4EditPart.VISUAL_ID:

+			return createConditionalUnit_3066(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SingleQueuedUnit7EditPart.VISUAL_ID:

+			return createSingleQueuedUnit_3067(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case AtomicUnit4EditPart.VISUAL_ID:

+			return createAtomicUnit_3068(domainElement, containerView, index,

+					persisted, preferencesHint);

+		case SequentialUnit5EditPart.VISUAL_ID:

+			return createSequentialUnit_3069(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SequentialUnit6EditPart.VISUAL_ID:

+			return createSequentialUnit_3070(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ConditionalUnit5EditPart.VISUAL_ID:

+			return createConditionalUnit_3071(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ConditionalUnit6EditPart.VISUAL_ID:

+			return createConditionalUnit_3072(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case SequentialUnit7EditPart.VISUAL_ID:

+			return createSequentialUnit_3073(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case AtomicUnit5EditPart.VISUAL_ID:

+			return createAtomicUnit_3074(domainElement, containerView, index,

+					persisted, preferencesHint);

+		case ConditionalUnit7EditPart.VISUAL_ID:

+			return createConditionalUnit_3075(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case ConditionCheckEditPart.VISUAL_ID:

+			return createConditionCheck_3076(domainElement, containerView,

+					index, persisted, preferencesHint);

+		case AtomicUnit6EditPart.VISUAL_ID:

+			return createAtomicUnit_3077(domainElement, containerView, index,

+					persisted, preferencesHint);

+		case AtomicUnit7EditPart.VISUAL_ID:

+			return createAtomicUnit_3078(domainElement, containerView, index,

+					persisted, preferencesHint);

+		}

+		// can't happen, provided #provides(CreateNodeViewOperation) is correct

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createEdge(IAdaptable semanticAdapter, View containerView,

+			String semanticHint, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		IElementType elementType = getSemanticElementType(semanticAdapter);

+		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

+		switch (ComrelVisualIDRegistry.getVisualID(elementTypeHint)) {

+		case SinglePortMappingEditPart.VISUAL_ID:

+			return createSinglePortMapping_4001(

+					getSemanticElement(semanticAdapter), containerView, index,

+					persisted, preferencesHint);

+		case MultiPortMappingEditPart.VISUAL_ID:

+			return createMultiPortMapping_4002(

+					getSemanticElement(semanticAdapter), containerView, index,

+					persisted, preferencesHint);

+		case MultiSinglePortMappingEditPart.VISUAL_ID:

+			return createMultiSinglePortMapping_4003(

+					getSemanticElement(semanticAdapter), containerView, index,

+					persisted, preferencesHint);

+		}

+		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_2001(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPortEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		stampShortcut(containerView, node);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5001 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameTypeEditPart.VISUAL_ID));

+		label5001.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5001 = (Location) label5001.getLayoutConstraint();

+		location5001.setX(0);

+		location5001.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCartesianQueuedUnit_2002(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		stampShortcut(containerView, node);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5080 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParallelQueuedUnit_2003(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		stampShortcut(containerView, node);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5081 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleQueuedUnit_2004(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		stampShortcut(containerView, node);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5082 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSequentialUnit_2005(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SequentialUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		stampShortcut(containerView, node);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5083 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitNameTypeLblStrictEditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitHelperUnitsCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionalUnit_2006(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionalUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		stampShortcut(containerView, node);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5084 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameTypeEditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitIfCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitThenCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitElseCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAtomicUnit_2007(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(AtomicUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		stampShortcut(containerView, node);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5085 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelTypeEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3001(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5002 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType2EditPart.VISUAL_ID));

+		label5002.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5002 = (Location) label5002.getLayoutConstraint();

+		location5002.setX(0);

+		location5002.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3002(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPortEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5003 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameTypeEditPart.VISUAL_ID));

+		label5003.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5003 = (Location) label5003.getLayoutConstraint();

+		location5003.setX(0);

+		location5003.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCartesianQueuedUnit_3003(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5079 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParallelQueuedUnit_3004(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5078 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3005(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5004 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType3EditPart.VISUAL_ID));

+		label5004.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5004 = (Location) label5004.getLayoutConstraint();

+		location5004.setX(0);

+		location5004.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3006(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5005 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType2EditPart.VISUAL_ID));

+		label5005.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5005 = (Location) label5005.getLayoutConstraint();

+		location5005.setX(0);

+		location5005.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCartesianQueuedUnit_3007(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5077 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFeatureUnit_3008(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5009 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameTypeEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3009(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5006 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType4EditPart.VISUAL_ID));

+		label5006.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5006 = (Location) label5006.getLayoutConstraint();

+		location5006.setX(0);

+		location5006.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3010(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5007 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType3EditPart.VISUAL_ID));

+		label5007.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5007 = (Location) label5007.getLayoutConstraint();

+		location5007.setX(0);

+		location5007.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleOutputPort_3011(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleOutputPortEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5008 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleOutputPortNameTypeEditPart.VISUAL_ID));

+		label5008.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5008 = (Location) label5008.getLayoutConstraint();

+		location5008.setX(0);

+		location5008.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFeatureUnit_3012(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5013 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameTypeEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3013(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5010 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType5EditPart.VISUAL_ID));

+		label5010.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5010 = (Location) label5010.getLayoutConstraint();

+		location5010.setX(0);

+		location5010.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3014(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5011 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType4EditPart.VISUAL_ID));

+		label5011.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5011 = (Location) label5011.getLayoutConstraint();

+		location5011.setX(0);

+		location5011.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiOutputPort_3015(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiOutputPortEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5012 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiOutputPortNameTypeEditPart.VISUAL_ID));

+		label5012.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5012 = (Location) label5012.getLayoutConstraint();

+		location5012.setX(0);

+		location5012.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFilterUnit_3016(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFilterUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5016 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameTypeEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3017(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5014 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType5EditPart.VISUAL_ID));

+		label5014.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5014 = (Location) label5014.getLayoutConstraint();

+		location5014.setX(0);

+		location5014.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleOutputPort_3018(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleOutputPort2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5015 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleOutputPortNameType2EditPart.VISUAL_ID));

+		label5015.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5015 = (Location) label5015.getLayoutConstraint();

+		location5015.setX(0);

+		location5015.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFilterUnit_3019(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFilterUnitEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5019 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameTypeEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3020(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5017 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType6EditPart.VISUAL_ID));

+		label5017.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5017 = (Location) label5017.getLayoutConstraint();

+		location5017.setX(0);

+		location5017.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiOutputPort_3021(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiOutputPort2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5018 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiOutputPortNameType2EditPart.VISUAL_ID));

+		label5018.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5018 = (Location) label5018.getLayoutConstraint();

+		location5018.setX(0);

+		location5018.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleQueuedUnit_3022(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5076 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3023(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5020 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType6EditPart.VISUAL_ID));

+		label5020.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5020 = (Location) label5020.getLayoutConstraint();

+		location5020.setX(0);

+		location5020.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3024(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5021 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType7EditPart.VISUAL_ID));

+		label5021.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5021 = (Location) label5021.getLayoutConstraint();

+		location5021.setX(0);

+		location5021.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCartesianQueuedUnit_3025(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5075 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSequentialUnit_3026(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SequentialUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5074 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitNameTypeLblStrict2EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitHelperUnitsCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3027(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5022 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType7EditPart.VISUAL_ID));

+		label5022.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5022 = (Location) label5022.getLayoutConstraint();

+		location5022.setX(0);

+		location5022.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3028(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort8EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5023 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType8EditPart.VISUAL_ID));

+		label5023.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5023 = (Location) label5023.getLayoutConstraint();

+		location5023.setX(0);

+		location5023.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCartesianQueuedUnit_3029(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5073 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionalUnit_3030(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionalUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5072 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType2EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitIfCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitHelperUnitsCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitThenCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitElseCompartmentEditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3031(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort8EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5024 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType8EditPart.VISUAL_ID));

+		label5024.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5024 = (Location) label5024.getLayoutConstraint();

+		location5024.setX(0);

+		location5024.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiInputPort_3032(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.getStyles()

+				.add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiInputPort9EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5025 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiInputPortNameType9EditPart.VISUAL_ID));

+		label5025.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5025 = (Location) label5025.getLayoutConstraint();

+		location5025.setX(0);

+		location5025.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCartesianQueuedUnit_3033(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnit6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5028 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAtomicUnit_3034(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(AtomicUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5027 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType2EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleInputPort_3035(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleInputPort9EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5026 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleInputPortNameType9EditPart.VISUAL_ID));

+		label5026.setLayoutConstraint(NotationFactory.eINSTANCE

+				.createLocation());

+		Location location5026 = (Location) label5026.getLayoutConstraint();

+		location5026.setX(0);

+		location5026.setY(5);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParallelQueuedUnit_3036(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5071 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParallelQueuedUnit_3037(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5070 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFeatureUnit_3038(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5029 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType2EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFeatureUnit_3039(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5030 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType2EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFilterUnit_3040(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFilterUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5031 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType2EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFilterUnit_3041(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFilterUnit2EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5032 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType2EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleQueuedUnit_3042(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5069 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParallelQueuedUnit_3043(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5068 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSequentialUnit_3044(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SequentialUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5067 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitNameTypeLblStrict3EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitHelperUnitsCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParallelQueuedUnit_3045(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnit6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5066 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionalUnit_3046(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionalUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5065 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType3EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitIfCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitThenCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitElseCompartment2EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCartesianQueuedUnit_3047(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(CartesianQueuedUnit7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5033 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitHelperUnitsCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(CartesianQueuedUnitCartesianQueuedUnitRefactoringUnitCompartment7EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParallelQueuedUnit_3048(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ParallelQueuedUnit7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5035 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ParallelQueuedUnitParallelQueuedUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAtomicUnit_3049(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(AtomicUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5034 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType3EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFeatureUnit_3050(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5036 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType3EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFeatureUnit_3051(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5037 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType3EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFilterUnit_3052(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFilterUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5038 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType3EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFilterUnit_3053(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFilterUnit3EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5039 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType3EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleQueuedUnit_3054(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5064 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFeatureUnit_3055(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5040 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType4EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFeatureUnit_3056(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5041 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType4EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFilterUnit_3057(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFilterUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5042 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType4EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFilterUnit_3058(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFilterUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5043 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType4EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleQueuedUnit_3059(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5063 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSequentialUnit_3060(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SequentialUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5062 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitNameTypeLblStrict4EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitHelperUnitsCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFeatureUnit_3061(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFeatureUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5044 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFeatureUnitNameType5EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFeatureUnit_3062(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFeatureUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5045 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFeatureUnitNameType5EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleFilterUnit_3063(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleFilterUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5046 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(SingleFilterUnitNameType5EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createMultiFilterUnit_3064(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(MultiFilterUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5047 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(MultiFilterUnitNameType5EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleQueuedUnit_3065(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnit6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5061 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionalUnit_3066(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionalUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5060 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType4EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitIfCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitThenCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitElseCompartment3EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSingleQueuedUnit_3067(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SingleQueuedUnit7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5049 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitHelperUnitsCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SingleQueuedUnitSingleQueuedUnitRefactoringUnitCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAtomicUnit_3068(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(AtomicUnit4EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5048 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType4EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSequentialUnit_3069(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SequentialUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5059 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitNameTypeLblStrict5EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitHelperUnitsCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSequentialUnit_3070(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SequentialUnit6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5058 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitNameTypeLblStrict6EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitHelperUnitsCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionalUnit_3071(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionalUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5057 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType5EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitIfCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitThenCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitElseCompartment4EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionalUnit_3072(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionalUnit6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5056 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType6EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitIfCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitThenCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitElseCompartment5EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSequentialUnit_3073(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(SequentialUnit7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5051 = createLabel(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitNameTypeLblStrict7EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitHelperUnitsCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(SequentialUnitSequentialUnitRefactoringUnitsCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAtomicUnit_3074(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(AtomicUnit5EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5050 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType5EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionalUnit_3075(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(

+				NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionalUnit7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5055 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitNameType7EditPart.VISUAL_ID));

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitIfCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitHelperUnitsCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitThenCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		createCompartment(

+				node,

+				ComrelVisualIDRegistry

+						.getType(ConditionalUnitConditionalUnitElseCompartment6EditPart.VISUAL_ID),

+				true, false, false, false);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConditionCheck_3076(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(ConditionCheckEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5052 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(ConditionCheckNameTypeSpecEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAtomicUnit_3077(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(AtomicUnit6EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5053 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType6EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAtomicUnit_3078(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(ComrelVisualIDRegistry

+				.getType(AtomicUnit7EditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle nodeFontStyle = (FontStyle) node

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (nodeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			nodeFontStyle.setFontName(fontData.getName());

+			nodeFontStyle.setFontHeight(fontData.getHeight());

+			nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_FILL_COLOR);

+		ViewUtil.setStructuralFeatureValue(node,

+				NotationPackage.eINSTANCE.getFillStyle_FillColor(),

+				FigureUtilities.RGBToInteger(fillRGB));

+		Node label5054 = createLabel(node,

+				ComrelVisualIDRegistry

+						.getType(AtomicUnitLabelType7EditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createSinglePortMapping_4001(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

+		points.add(new RelativeBendpoint());

+		points.add(new RelativeBendpoint());

+		bendpoints.setPoints(points);

+		edge.setBendpoints(bendpoints);

+		ViewUtil.insertChildView(containerView, edge, index, persisted);

+		edge.setType(ComrelVisualIDRegistry

+				.getType(SinglePortMappingEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(edge,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle edgeFontStyle = (FontStyle) edge

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (edgeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			edgeFontStyle.setFontName(fontData.getName());

+			edgeFontStyle.setFontHeight(fontData.getHeight());

+			edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		Routing routing = Routing.get(prefStore

+				.getInt(IPreferenceConstants.PREF_LINE_STYLE));

+		if (routing != null) {

+			ViewUtil.setStructuralFeatureValue(edge,

+					NotationPackage.eINSTANCE.getRoutingStyle_Routing(),

+					routing);

+		}

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createMultiPortMapping_4002(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

+		points.add(new RelativeBendpoint());

+		points.add(new RelativeBendpoint());

+		bendpoints.setPoints(points);

+		edge.setBendpoints(bendpoints);

+		ViewUtil.insertChildView(containerView, edge, index, persisted);

+		edge.setType(ComrelVisualIDRegistry

+				.getType(MultiPortMappingEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(edge,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle edgeFontStyle = (FontStyle) edge

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (edgeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			edgeFontStyle.setFontName(fontData.getName());

+			edgeFontStyle.setFontHeight(fontData.getHeight());

+			edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		Routing routing = Routing.get(prefStore

+				.getInt(IPreferenceConstants.PREF_LINE_STYLE));

+		if (routing != null) {

+			ViewUtil.setStructuralFeatureValue(edge,

+					NotationPackage.eINSTANCE.getRoutingStyle_Routing(),

+					routing);

+		}

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createMultiSinglePortMapping_4003(EObject domainElement,

+			View containerView, int index, boolean persisted,

+			PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE

+				.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(

+				2);

+		points.add(new RelativeBendpoint());

+		points.add(new RelativeBendpoint());

+		bendpoints.setPoints(points);

+		edge.setBendpoints(bendpoints);

+		ViewUtil.insertChildView(containerView, edge, index, persisted);

+		edge.setType(ComrelVisualIDRegistry

+				.getType(MultiSinglePortMappingEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint

+				.getPreferenceStore();

+

+		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(

+				prefStore, IPreferenceConstants.PREF_LINE_COLOR);

+		ViewUtil.setStructuralFeatureValue(edge,

+				NotationPackage.eINSTANCE.getLineStyle_LineColor(),

+				FigureUtilities.RGBToInteger(lineRGB));

+		FontStyle edgeFontStyle = (FontStyle) edge

+				.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if (edgeFontStyle != null) {

+			FontData fontData = PreferenceConverter.getFontData(prefStore,

+					IPreferenceConstants.PREF_DEFAULT_FONT);

+			edgeFontStyle.setFontName(fontData.getName());

+			edgeFontStyle.setFontHeight(fontData.getHeight());

+			edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

+			edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter

+					.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);

+			edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)

+					.intValue());

+		}

+		Routing routing = Routing.get(prefStore

+				.getInt(IPreferenceConstants.PREF_LINE_STYLE));

+		if (routing != null) {

+			ViewUtil.setStructuralFeatureValue(edge,

+					NotationPackage.eINSTANCE.getRoutingStyle_Routing(),

+					routing);

+		}

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	private void stampShortcut(View containerView, Node target) {

+		if (!CompositeRefactoringEditPart.MODEL_ID

+				.equals(ComrelVisualIDRegistry.getModelID(containerView))) {

+			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE

+					.createEAnnotation();

+			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$

+			shortcutAnnotation.getDetails().put(

+					"modelID", CompositeRefactoringEditPart.MODEL_ID); //$NON-NLS-1$

+			target.getEAnnotations().add(shortcutAnnotation);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private Node createLabel(View owner, String hint) {

+		DecorationNode rv = NotationFactory.eINSTANCE.createDecorationNode();

+		rv.setType(hint);

+		ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);

+		return rv;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Node createCompartment(View owner, String hint,

+			boolean canCollapse, boolean hasTitle, boolean canSort,

+			boolean canFilter) {

+		//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();

+		//rv.setShowTitle(showTitle);

+		//rv.setCollapsed(isCollapsed);

+		Node rv;

+		if (canCollapse) {

+			rv = NotationFactory.eINSTANCE.createBasicCompartment();

+		} else {

+			rv = NotationFactory.eINSTANCE.createDecorationNode();

+		}

+		if (hasTitle) {

+			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

+			ts.setShowTitle(true);

+			rv.getStyles().add(ts);

+		}

+		if (canSort) {

+			rv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle());

+		}

+		if (canFilter) {

+			rv.getStyles()

+					.add(NotationFactory.eINSTANCE.createFilteringStyle());

+		}

+		rv.setType(hint);

+		ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);

+		return rv;

+	}

+

+	/**

+	 * @generated

+	 */

+	private EObject getSemanticElement(IAdaptable semanticAdapter) {

+		if (semanticAdapter == null) {

+			return null;

+		}

+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);

+		if (eObject != null) {

+			return EMFCoreUtil.resolve(

+					TransactionUtil.getEditingDomain(eObject), eObject);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IElementType getSemanticElementType(IAdaptable semanticAdapter) {

+		if (semanticAdapter == null) {

+			return null;

+		}

+		return (IElementType) semanticAdapter.getAdapter(IElementType.class);

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ElementInitializers.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ElementInitializers.java
new file mode 100644
index 0000000..1d63a77
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/providers/ElementInitializers.java
@@ -0,0 +1,29 @@
+/*

+ * 

+ */

+package comrel.diagram.providers;

+

+import comrel.diagram.part.ComrelDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class ElementInitializers {

+

+	protected ElementInitializers() {

+		// use #getInstance to access cached instance

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ElementInitializers getInstance() {

+		ElementInitializers cached = ComrelDiagramEditorPlugin.getInstance()

+				.getElementInitializers();

+		if (cached == null) {

+			ComrelDiagramEditorPlugin.getInstance().setElementInitializers(

+					cached = new ElementInitializers());

+		}

+		return cached;

+	}

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/sheet/ComrelPropertySection.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/sheet/ComrelPropertySection.java
new file mode 100644
index 0000000..ccff61e
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/sheet/ComrelPropertySection.java
@@ -0,0 +1,120 @@
+/*

+ * 

+ */

+package comrel.diagram.sheet;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.ui.provider.PropertySource;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.properties.sections.AdvancedPropertySection;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.views.properties.IPropertySource;

+import org.eclipse.ui.views.properties.IPropertySourceProvider;

+

+/**

+ * @generated

+ */

+public class ComrelPropertySection extends AdvancedPropertySection implements

+		IPropertySourceProvider {

+

+	/**

+	 * @generated

+	 */

+	public IPropertySource getPropertySource(Object object) {

+		if (object instanceof IPropertySource) {

+			return (IPropertySource) object;

+		}

+		AdapterFactory af = getAdapterFactory(object);

+		if (af != null) {

+			IItemPropertySource ips = (IItemPropertySource) af.adapt(object,

+					IItemPropertySource.class);

+			if (ips != null) {

+				return new PropertySource(object, ips);

+			}

+		}

+		if (object instanceof IAdaptable) {

+			return (IPropertySource) ((IAdaptable) object)

+					.getAdapter(IPropertySource.class);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IPropertySourceProvider getPropertySourceProvider() {

+		return this;

+	}

+

+	/**

+	 * Modify/unwrap selection.

+	 * @generated

+	 */

+	protected Object transformSelection(Object selected) {

+

+		if (selected instanceof EditPart) {

+			Object model = ((EditPart) selected).getModel();

+			return model instanceof View ? ((View) model).getElement() : null;

+		}

+		if (selected instanceof View) {

+			return ((View) selected).getElement();

+		}

+		if (selected instanceof IAdaptable) {

+			View view = (View) ((IAdaptable) selected).getAdapter(View.class);

+			if (view != null) {

+				return view.getElement();

+			}

+		}

+		return selected;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setInput(IWorkbenchPart part, ISelection selection) {

+		if (selection.isEmpty()

+				|| false == selection instanceof StructuredSelection) {

+			super.setInput(part, selection);

+			return;

+		}

+		final StructuredSelection structuredSelection = ((StructuredSelection) selection);

+		ArrayList transformedSelection = new ArrayList(

+				structuredSelection.size());

+		for (Iterator it = structuredSelection.iterator(); it.hasNext();) {

+			Object r = transformSelection(it.next());

+			if (r != null) {

+				transformedSelection.add(r);

+			}

+		}

+		super.setInput(part, new StructuredSelection(transformedSelection));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AdapterFactory getAdapterFactory(Object object) {

+		if (getEditingDomain() instanceof AdapterFactoryEditingDomain) {

+			return ((AdapterFactoryEditingDomain) getEditingDomain())

+					.getAdapterFactory();

+		}

+		TransactionalEditingDomain editingDomain = TransactionUtil

+				.getEditingDomain(object);

+		if (editingDomain != null) {

+			return ((AdapterFactoryEditingDomain) editingDomain)

+					.getAdapterFactory();

+		}

+		return null;

+	}

+

+}

diff --git a/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/sheet/ComrelSheetLabelProvider.java b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/sheet/ComrelSheetLabelProvider.java
new file mode 100644
index 0000000..7564e31
--- /dev/null
+++ b/org.eclipse.emf.refactor.comrel.diagram/src/comrel/diagram/sheet/ComrelSheetLabelProvider.java
@@ -0,0 +1,84 @@
+/*

+ * 

+ */

+package comrel.diagram.sheet;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.BaseLabelProvider;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.swt.graphics.Image;

+

+import comrel.diagram.navigator.ComrelNavigatorGroup;

+import comrel.diagram.part.ComrelVisualIDRegistry;

+import comrel.diagram.providers.ComrelElementTypes;

+

+/**

+ * @generated

+ */

+public class ComrelSheetLabelProvider extends BaseLabelProvider implements

+		ILabelProvider {

+

+	/**

+	 * @generated

+	 */

+	public String getText(Object element) {

+		element = unwrap(element);

+		if (element instanceof ComrelNavigatorGroup) {

+			return ((ComrelNavigatorGroup) element).getGroupName();

+		}

+		IElementType etype = getElementType(getView(element));

+		return etype == null ? "" : etype.getDisplayName();

+	}

+

+	/**

+	 * @generated

+	 */

+	public Image getImage(Object element) {

+		IElementType etype = getElementType(getView(unwrap(element)));

+		return etype == null ? null : ComrelElementTypes.getImage(etype);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Object unwrap(Object element) {

+		if (element instanceof IStructuredSelection) {

+			return ((IStructuredSelection) element).getFirstElement();

+		}

+		return element;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getView(Object element) {

+		if (element instanceof View) {

+			return (View) element;

+		}

+		if (element instanceof IAdaptable) {

+			return (View) ((IAdaptable) element).getAdapter(View.class);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IElementType getElementType(View view) {

+		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.

+		while (view != null) {

+			int vid = ComrelVisualIDRegistry.getVisualID(view);

+			IElementType etype = ComrelElementTypes.getElementType(vid);

+			if (etype != null) {

+				return etype;

+			}

+			view = view.eContainer() instanceof View ? (View) view.eContainer()

+					: null;

+		}

+		return null;

+	}

+

+}