First version of the UML interaction overview diagram editor

160 files changed, 8767 insertions, 0 deletions

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.classpath b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.classpath
new file mode 100644
index 00000000000..cef78a13451
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

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

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

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

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

+</classpath>

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.project b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.project
new file mode 100644
index 00000000000..f57e2d89482
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.uml.diagram.interactionoverview</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

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

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

+	</natures>

+</projectDescription>

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.jdt.ui.prefs b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..430180b68e1
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,57 @@
+cleanup.add_default_serial_version_id=true

+cleanup.add_generated_serial_version_id=false

+cleanup.add_missing_annotations=true

+cleanup.add_missing_deprecated_annotations=true

+cleanup.add_missing_methods=false

+cleanup.add_missing_nls_tags=false

+cleanup.add_missing_override_annotations=true

+cleanup.add_missing_override_annotations_interface_methods=true

+cleanup.add_serial_version_id=false

+cleanup.always_use_blocks=true

+cleanup.always_use_parentheses_in_expressions=false

+cleanup.always_use_this_for_non_static_field_access=false

+cleanup.always_use_this_for_non_static_method_access=false

+cleanup.convert_to_enhanced_for_loop=false

+cleanup.correct_indentation=false

+cleanup.format_source_code=false

+cleanup.format_source_code_changes_only=false

+cleanup.make_local_variable_final=true

+cleanup.make_parameters_final=true

+cleanup.make_private_fields_final=true

+cleanup.make_type_abstract_if_missing_method=false

+cleanup.make_variable_declarations_final=true

+cleanup.never_use_blocks=false

+cleanup.never_use_parentheses_in_expressions=true

+cleanup.organize_imports=false

+cleanup.qualify_static_field_accesses_with_declaring_class=false

+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

+cleanup.qualify_static_member_accesses_with_declaring_class=true

+cleanup.qualify_static_method_accesses_with_declaring_class=false

+cleanup.remove_private_constructors=true

+cleanup.remove_trailing_whitespaces=false

+cleanup.remove_trailing_whitespaces_all=true

+cleanup.remove_trailing_whitespaces_ignore_empty=false

+cleanup.remove_unnecessary_casts=true

+cleanup.remove_unnecessary_nls_tags=true

+cleanup.remove_unused_imports=true

+cleanup.remove_unused_local_variables=false

+cleanup.remove_unused_private_fields=true

+cleanup.remove_unused_private_members=false

+cleanup.remove_unused_private_methods=true

+cleanup.remove_unused_private_types=true

+cleanup.sort_members=false

+cleanup.sort_members_all=false

+cleanup.use_blocks=false

+cleanup.use_blocks_only_for_return_and_throw=false

+cleanup.use_parentheses_in_expressions=false

+cleanup.use_this_for_non_static_field_access=false

+cleanup.use_this_for_non_static_field_access_only_if_necessary=true

+cleanup.use_this_for_non_static_method_access=false

+cleanup.use_this_for_non_static_method_access_only_if_necessary=true

+cleanup_profile=_Eclipse [built-in] with final

+cleanup_settings_version=2

+eclipse.preferences.version=1

+formatter_settings_version=12

+org.eclipse.jdt.ui.javadoc=false

+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * Constructor.\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n *\r\n * ${tags}\r\n */\r\n</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${see_to_target}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.ltk.core.refactoring.prefs b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 00000000000..cfcd1d3c22f
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..e8ac6ddefcb
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -0,0 +1,35 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview;singleton:=true
+Bundle-Version: 0.10.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.10.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="0.10.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.emf.common.ui;bundle-version="2.7.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.0",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="0.10.0",
+ org.eclipse.ui.navigator;bundle-version="3.5.200",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.10.0",
+ com.google.guava;bundle-version="10.0.1",
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.gen.MF b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.gen.MF
new file mode 100644
index 00000000000..cecdaaaee1b
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.gen.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.Activator
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.common,
+ org.eclipse.papyrus.infra.gmfdiag.common,
+ org.eclipse.gmf.runtime.diagram.ui.providers,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.papyrus.uml.diagram.activity,
+ org.eclipse.papyrus.preferences
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/about.html b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.class
new file mode 100644
index 00000000000..4268bee9a4e
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/CreateInteractionOverviewDiagramWithNavigationHandler.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/CreateInteractionOverviewDiagramWithNavigationHandler.class
new file mode 100644
index 00000000000..266bd3b2f46
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/CreateInteractionOverviewDiagramWithNavigationHandler.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreateCommand.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreateCommand.class
new file mode 100644
index 00000000000..cd35a2e6ffd
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreateCommand.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreationCondition.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreationCondition.class
new file mode 100644
index 00000000000..8a9113bb071
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreationCondition.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramEditorFactory.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramEditorFactory.class
new file mode 100644
index 00000000000..1d2a04025b2
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramEditorFactory.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramForMultiEditor.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramForMultiEditor.class
new file mode 100644
index 00000000000..f67be6ae230
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramForMultiEditor.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CallBehaviorActionAsInteractionUseCreateCommand.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CallBehaviorActionAsInteractionUseCreateCommand.class
new file mode 100644
index 00000000000..cfb54118b93
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CallBehaviorActionAsInteractionUseCreateCommand.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/dialogs/CreateInteractionUseDialog.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/dialogs/CreateInteractionUseDialog.class
new file mode 100644
index 00000000000..d12b0464fd6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/dialogs/CreateInteractionUseDialog.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomActivityEditPartTN.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomActivityEditPartTN.class
new file mode 100644
index 00000000000..e6836d4b0b3
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomActivityEditPartTN.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.class
new file mode 100644
index 00000000000..dc416d10060
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.class
new file mode 100644
index 00000000000..915375601ae
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.class
new file mode 100644
index 00000000000..32ce99d6022
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.class
new file mode 100644
index 00000000000..40fec27b4f1
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..16c9925d04d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityCNContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityCNContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..fb627691480
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityCNContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..60cc5118690
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..bd40ff3acb7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..a522dcb4727
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInteractionOverviewDiagramCreationEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInteractionOverviewDiagramCreationEditPolicy.class
new file mode 100644
index 00000000000..730e0d233ea
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInteractionOverviewDiagramCreationEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..c0adc78c2f6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..8a721a0b296
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..7fda6b51fcb
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
new file mode 100644
index 00000000000..0e3b96226b6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.class
new file mode 100644
index 00000000000..eca83e91189
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/InteractionOverviewDiagramDragDropEditPolicy.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/InteractionOverviewDiagramDragDropEditPolicy.class
new file mode 100644
index 00000000000..286156646af
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/InteractionOverviewDiagramDragDropEditPolicy.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.class
new file mode 100644
index 00000000000..5b2af00599e
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure$1.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure$1.class
new file mode 100644
index 00000000000..6101f291b29
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure$1.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure$ActivityLayoutManager.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure$ActivityLayoutManager.class
new file mode 100644
index 00000000000..c3433cd2061
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure$ActivityLayoutManager.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.class
new file mode 100644
index 00000000000..51d74ee5837
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure$1.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure$1.class
new file mode 100644
index 00000000000..7baacc8c42f
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure$1.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure$InteractionUseLayoutManager.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure$InteractionUseLayoutManager.class
new file mode 100644
index 00000000000..c1db1a09cfe
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure$InteractionUseLayoutManager.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.class
new file mode 100644
index 00000000000..1f988113182
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/parser/CustomCallBehaviorActionParser.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/parser/CustomCallBehaviorActionParser.class
new file mode 100644
index 00000000000..143c98ed7f7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/parser/CustomCallBehaviorActionParser.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$1.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$1.class
new file mode 100644
index 00000000000..0a1812b8d35
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$1.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2$1.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2$1.class
new file mode 100644
index 00000000000..86f9a43e08f
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2$1.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2$2.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2$2.class
new file mode 100644
index 00000000000..abf133f75be
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2$2.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2.class
new file mode 100644
index 00000000000..5d77041374b
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$2.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$3.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$3.class
new file mode 100644
index 00000000000..dcd4d677f82
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor$3.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor.class
new file mode 100644
index 00000000000..d512cba271f
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/Messages.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/Messages.class
new file mode 100644
index 00000000000..b5fd686e0c6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/Messages.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.class
new file mode 100644
index 00000000000..1d1401c0688
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.class
new file mode 100644
index 00000000000..603f7ffe017
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.class
new file mode 100644
index 00000000000..046e2aaceda
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.class
new file mode 100644
index 00000000000..d2d5fb36992
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.class
new file mode 100644
index 00000000000..c72ccae0940
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.class
new file mode 100644
index 00000000000..9a5a94ea955
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.class
new file mode 100644
index 00000000000..fabf13125b4
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.class
new file mode 100644
index 00000000000..a157031af0a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.class
new file mode 100644
index 00000000000..5619ecdd1ff
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.class
new file mode 100644
index 00000000000..b5d619f27e6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.class
new file mode 100644
index 00000000000..49e3f330cc8
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.class
new file mode 100644
index 00000000000..40634adfc8e
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/IInteractionOverviewPreferenceConstants.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/IInteractionOverviewPreferenceConstants.class
new file mode 100644
index 00000000000..bd1896f44df
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/IInteractionOverviewPreferenceConstants.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.class
new file mode 100644
index 00000000000..3732dfc9e3c
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.class
new file mode 100644
index 00000000000..7fe08eebd16
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.class
new file mode 100644
index 00000000000..5fedf282f5d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.class
new file mode 100644
index 00000000000..976d49c8998
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.class
new file mode 100644
index 00000000000..6f66c30d573
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.class
new file mode 100644
index 00000000000..d268ec846c4
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.class
new file mode 100644
index 00000000000..ac7f32b4e1a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.class
new file mode 100644
index 00000000000..250b8b8ab19
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.class
new file mode 100644
index 00000000000..9e754aa6581
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.class
new file mode 100644
index 00000000000..a2ddba99c8d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.class
new file mode 100644
index 00000000000..4b0826274e4
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPartProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPartProvider.class
new file mode 100644
index 00000000000..5e037ef2cd7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPartProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPolicyProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPolicyProvider.class
new file mode 100644
index 00000000000..f94fd2e2fe5
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPolicyProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.class
new file mode 100644
index 00000000000..e3a6cf8e62c
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.class
new file mode 100644
index 00000000000..4b88c3f8d98
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.class
new file mode 100644
index 00000000000..7af49f0c490
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/GraphicalTypeRegistry.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/GraphicalTypeRegistry.class
new file mode 100644
index 00000000000..b01586f3b21
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/GraphicalTypeRegistry.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/IGraphicalTypeRegistry.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/IGraphicalTypeRegistry.class
new file mode 100644
index 00000000000..10af044d6fd
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/IGraphicalTypeRegistry.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.class
new file mode 100644
index 00000000000..dd8a038b2eb
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.class
new file mode 100644
index 00000000000..2940fda9e2d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPartProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPartProvider.class
new file mode 100644
index 00000000000..33cd1d53d10
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPartProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPolicyProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPolicyProvider.class
new file mode 100644
index 00000000000..fc868f83ca7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPolicyProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramViewProvider.class b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramViewProvider.class
new file mode 100644
index 00000000000..f5b301ab52b
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/bin/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramViewProvider.class
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/build.gen.properties b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/build.gen.properties
new file mode 100644
index 00000000000..ca6d14e16f2
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/build.gen.properties
@@ -0,0 +1,10 @@
+source.. = src/,\
+           src-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               palettes/,\
+               icons/,\
+               about.html,\
+               plugin.properties
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
new file mode 100644
index 00000000000..42ded34702d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
@@ -0,0 +1,10 @@
+source.. = src/,\

+           src-gen/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               palettes/,\

+               icons/,\

+               about.html,\

+               plugin.properties
\ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif
new file mode 100644
index 00000000000..0a77dec8e48
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/messages.properties b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/messages.properties
new file mode 100644
index 00000000000..0edd3525a82
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/messages.properties
@@ -0,0 +1,7 @@
+CustomInteractionOverviewDiagramCreationEditPolicy_CreateActivity

+CreateCallActionDialog_BehaviorInvocationCreationTitle=Create a new InteractionUse

+CreateCallActionDialog_BehaviorInvocationCreationHelp=<form><p>InteractionUse is a call action that invokes an interaction</p></form>

+CreateCallActionDialog_BehaviorInvocationSelectionTitle=Or assign an existing one

+CreateCallActionDialog_BehaviorTitle=Create a new InteractionUse

+CreateCallActionDialog_SelectBehavior=Select InteractionUse

+CreateCallActionDialog_CreateBehavior=Create InteractionUse
\ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/model/UML.InteractionOverview.idgen b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/model/UML.InteractionOverview.idgen
new file mode 100644
index 00000000000..54678d0b032
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/model/UML.InteractionOverview.idgen
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<idgen:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" xmlns:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="InteractionOverviewDiagram" type="" icon="" label="Interaction Overview Diagram" language="uml" javaPackagePrefix="org.eclipse.papyrus.uml.diagram.interactionoverview" javaClassPrefix="InteractionOverviewDiagram" createCommandLabel="Create a new Interaction Overview Diagram">

+  <diagramEditPart name="InteractionOverviewDiagramEditPart">

+    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>

+    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomInteractionOverviewDiagramCreationEditPolicy" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"/>

+  </diagramEditPart>

+  <inheritedDiagrams name="ActivityDiagram" viewProviderClassQualifiedName="org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLViewProvider" editPartProviderClassQualifiedName="org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLEditPartProvider" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy">

+    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#PapyrusUMLActivityDiagram"/>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.4"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.11"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.69"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.56"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.32"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.5"/>

+    </genNodes>

+    <genNodes name="">

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.34"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.3"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.35"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.60"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.33"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.75"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@topLevelNodes.0"/>

+    </genNodes>

+    <genNodes>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.64"/>

+    </genNodes>

+    <genNodes name="">

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@childNodes.93"/>

+    </genNodes>

+    <genLinks>

+      <genLink href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@links.5"/>

+    </genLinks>

+    <genLinks>

+      <genLink href="../../org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen#/0/@diagram/@links.3"/>

+    </genLinks>

+  </inheritedDiagrams>

+  <customJavaClasses name="" customEditPolicyProvider="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPolicyProvider" customViewProvider="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomViewProvider" customEditPartProvider="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPartProvider" customPreferenceInitializer=""/>

+</idgen:Diagram>

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.gen.xml b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.gen.xml
new file mode 100644
index 00000000000..3f936078fa7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.gen.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer
+			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+			id="org.eclipse.papyrus.uml.diagram.interactionoverview.UML_InteractionOverviewDiagram__Tools" name="Tools">
+			<aspectTool description="Create a new Activity" id="interactionoverviewdiagram.tool.activity"
+				name="Activity" refToolId="createActivity1CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new ActivityFinalNode" id="interactionoverviewdiagram.tool.activityfinalnode"
+				name="ActivityFinalNode" refToolId="createActivityfinal2CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new CallBehaviorAction" id="interactionoverviewdiagram.tool.callbehavioraction"
+				name="CallBehaviorAction" refToolId="createCallBehaviorAction2CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new Comment" id="interactionoverviewdiagram.tool.comment"
+				name="Comment" refToolId="createComment5CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new ConditionalNode" id="interactionoverviewdiagram.tool.conditionalnode"
+				name="ConditionalNode" refToolId="createConditionalNode4CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new Constraint" id="interactionoverviewdiagram.tool.constraint"
+				name="Constraint" refToolId="createConstraint6CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new DecisionNode" id="interactionoverviewdiagram.tool.decisionnode"
+				name="DecisionNode" refToolId="createDecisionnode4CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new FlowFinalNode" id="interactionoverviewdiagram.tool.flowfinalnode"
+				name="FlowFinalNode" refToolId="createFlowfinal3CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new ForkNode" id="interactionoverviewdiagram.tool.forknode"
+				name="ForkNode" refToolId="createForknode7CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new InitialNode" id="interactionoverviewdiagram.tool.initialnode"
+				name="InitialNode" refToolId="createInitialnode1CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new JoinNode" id="interactionoverviewdiagram.tool.joinnode"
+				name="JoinNode" refToolId="createJoinnode6CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new LoopNode" id="interactionoverviewdiagram.tool.loopnode"
+				name="LoopNode" refToolId="createLoopNode2CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new MergeNode" id="interactionoverviewdiagram.tool.mergenode"
+				name="MergeNode" refToolId="createMergenode5CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new NamedElement" id="interactionoverviewdiagram.tool.namedelement"
+				name="NamedElement" refToolId="">
+			</aspectTool>
+			<aspectTool description="Create a new SequenceNode" id="interactionoverviewdiagram.tool.sequencenode"
+				name="SequenceNode" refToolId="createSequenceNode3CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new CommentAnnotatedElement" id="interactionoverviewdiagram.tool.commentannotatedelement"
+				name="CommentAnnotatedElement" refToolId="createLink4CreationTool">
+			</aspectTool>
+			<aspectTool description="Create a new ControlFlow" id="interactionoverviewdiagram.tool.controlflow"
+				name="ControlFlow" refToolId="createControlFlow1CreationTool">
+			</aspectTool>
+						
+		</drawer>
+	</content>
+</paletteDefinition>
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.xml b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.xml
new file mode 100644
index 00000000000..a777629bca7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/interactionoverviewdiagram.palette.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+    <content>
+        <drawer id="internalblock.drawer.nodes" name="Nodes" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+            <aspectTool
+                description="Create a new Activity"
+                id="interactionoverviewdiagram.tool.activity"
+                name="Activity"
+                refToolId="createActivity1CreationTool">
+            </aspectTool>
+             <aspectTool
+                description="Create a new InteractionUse"
+                id="interactionoverviewdiagram.tool.callbehavioraction"
+                name="InteractionUse"
+                refToolId="createCallBehaviorAction2CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new InitialNode"
+                id="interactionoverviewdiagram.tool.initialnode"
+                name="InitialNode"
+                refToolId="createInitialnode1CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new ActivityFinalNode"
+                id="interactionoverviewdiagram.tool.activityfinalnode"
+                name="ActivityFinalNode"
+                refToolId="createActivityfinal2CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new FlowFinalNode"
+                id="interactionoverviewdiagram.tool.flowfinalnode"
+                name="FlowFinalNode"
+                refToolId="createFlowfinal3CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new DecisionNode"
+                id="interactionoverviewdiagram.tool.decisionnode"
+                name="DecisionNode"
+                refToolId="createDecisionnode4CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new ForkNode"
+                id="interactionoverviewdiagram.tool.forknode"
+                name="ForkNode"
+                refToolId="createForknode7CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new JoinNode"
+                id="interactionoverviewdiagram.tool.joinnode"
+                name="JoinNode"
+                refToolId="createJoinnode6CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new MergeNode"
+                id="interactionoverviewdiagram.tool.mergenode"
+                name="MergeNode"
+                refToolId="createMergenode5CreationTool">
+            </aspectTool>
+             <aspectTool
+                description="Create a new ConditionalNode"
+                id="interactionoverviewdiagram.tool.conditionalnode"
+                name="ConditionalNode"
+                refToolId="createConditionalNode4CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new LoopNode"
+                id="interactionoverviewdiagram.tool.loopnode"
+                name="LoopNode"
+                refToolId="createLoopNode2CreationTool">
+            </aspectTool>
+             <aspectTool
+                description="Create a new SequenceNode"
+                id="interactionoverviewdiagram.tool.sequencenode"
+                name="SequenceNode"
+                refToolId="createSequenceNode3CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new Comment"
+                id="interactionoverviewdiagram.tool.comment"
+                name="Comment"
+                refToolId="createComment5CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new Constraint"
+                id="interactionoverviewdiagram.tool.constraint"
+                name="Constraint"
+                refToolId="createConstraint6CreationTool">
+            </aspectTool>
+            </drawer>
+            <drawer id="internalblock.drawer.edges" name="Edges" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+            <aspectTool
+                description="Create a new CommentAnnotatedElement"
+                id="interactionoverviewdiagram.tool.commentannotatedelement"
+                name="CommentAnnotatedElement"
+                refToolId="createLink4CreationTool">
+            </aspectTool>
+            <aspectTool
+                description="Create a new ControlFlow"
+                id="interactionoverviewdiagram.tool.controlflow"
+                name="ControlFlow"
+                refToolId="createControlFlow1CreationTool">
+            </aspectTool>
+
+        </drawer>
+    </content>
+</paletteDefinition>
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.gen.xml b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.gen.xml
new file mode 100644
index 00000000000..b6f09eb2a4a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.gen.xml
@@ -0,0 +1,695 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+    <!-- Diagram declaration -->
+    <extension point="org.eclipse.papyrus.core.papyrusDiagram">
+        <creationCommand
+            creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand"
+            icon=""
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"
+            language="uml"
+            label="Interaction Overview Diagram"/>
+        <editorDiagram
+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
+            factoryClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramEditorFactory"
+            icon=""/>
+    </extension>
+
+    <!-- Diagram creation command and handler -->
+    <extension point="org.eclipse.ui.commands">
+        <command
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"
+            name="Create a new Interaction Overview Diagram"
+            description="Create a new Interaction Overview Diagram"
+            categoryId="org.eclipse.papyrus.editor.category"/>
+    </extension>
+
+    <extension point="org.eclipse.ui.handlers">
+        <handler
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand"
+            commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand">
+            <activeWhen>
+                <with variable="activeEditorId">
+                    <equals value="org.eclipse.papyrus.core.papyrusEditor"/>
+                </with>
+            </activeWhen>
+        </handler>
+    </extension>
+
+    <!-- Diagram creation command registration in menu and toolbar -->
+    <extension point="org.eclipse.ui.menus">
+
+        <menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
+            <menu
+                id="org.eclipse.papyrus.diagram.ui.menu.diagrams"
+                label="Diagrams">
+                <command
+                    commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"
+                    icon=""
+                    label="Create a new Interaction Overview Diagram"
+                    style="push"
+                    tooltip="Create a new Interaction Overview Diagram">
+                    <visibleWhen>
+                        <reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
+                    </visibleWhen>
+
+                </command>
+            </menu>
+        </menuContribution>
+
+        <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
+            <toolbar id="org.eclipse.papyrus.diagram.ui.toolbar">
+                <command
+                    commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"
+                    icon=""
+                    label="Create a new Interaction Overview Diagram"
+                    style="push"
+                    tooltip="Create a new Interaction Overview Diagram">
+                    <visibleWhen>
+                        <reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
+                    </visibleWhen>
+
+                </command>
+            </toolbar>
+        </menuContribution>
+
+        <menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
+            <command
+                commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"
+                icon=""
+                label="Create a new Interaction Overview Diagram"
+                style="push"
+                tooltip="Create a new Interaction Overview Diagram">
+                <visibleWhen>
+                    <reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
+                </visibleWhen>
+
+            </command>
+        </menuContribution>
+
+    </extension>
+
+    <!-- Palette tool declaration (declares the real palette containment) -->
+    <extension
+        point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+        name="UML_InteractionOverviewDiagram">
+
+        <paletteDefinition
+            ID="UML_InteractionOverviewDiagram"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            name="UML_InteractionOverviewDiagram"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+            path="palettes/interactionoverviewdiagram.palette.xml"
+            provider="CEA LIST">
+            <Priority name="Low"/>
+
+            <!-- Specify diagram this palette tools relate to -->
+            <editor id="org.eclipse.papyrus.uml.diagram.interactionoverview"/>
+        </paletteDefinition>
+    </extension>
+
+    <!-- Diagram view providers declaration -->
+    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
+        <!-- Diagram view provider -->
+        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomViewProvider">
+            <Priority name="Low"/>
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Diagram"
+                semanticHints=""/>
+        </viewProvider>
+
+        <!-- ViewProvider for inherited elements (from ActivityDiagram ViewProvider) -->
+        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramViewProvider">
+            <Priority name="Low"/>
+
+            <!-- "3005" = ACTIVITY_FINAL_NODE_CN "3008" = CALL_BEHAVIOR_ACTION_CN "3080" = COMMENT_CN "3069" = CONDITIONAL_NODE_CN "3038" = DECISION_NODE_CN "3006" 
+                = FLOW_FINAL_NODE_CN "3040" = FORK_NODE_CN "3004" = INITIAL_NODE_CN "3041" = JOIN_NODE_CN "3071" = LOOP_NODE_CN "3039" = MERGE_NODE_CN "3085" = SHAPE_NAMED_ELEMENT_CN 
+                "2001" = ACTIVITY "3073" = SEQUENCE_NODE_CN "3112" = CONSTRAINT_CN -->
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                semanticHints="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112"/>
+
+            <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN -->
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                semanticHints="3001, 3002, 3003"/>
+
+            <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW -->
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Edge"
+                semanticHints="4006, 4004"/>
+
+            <object
+                id="elementtype.node"
+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
+
+                <method
+                    name="getSemanticHint()"
+                    value="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112">
+                </method>
+            </object>
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                elements="elementtype.node"/>
+
+            <object
+                id="elementtype.edge"
+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
+
+                <method
+                    name="getSemanticHint()"
+                    value="4006, 4004">
+                </method>
+            </object>
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Edge"
+                elements="elementtype.edge"/>
+
+
+            <!-- Additional descriptors provided in case the semantic hint is is not provided -->
+
+            <!-- "uml.ActivityFinalNode" -->
+            <object
+                id="uml.ActivityFinalNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ActivityFinalNode"/>
+            </object>
+
+            <!-- "uml.CallBehaviorAction" -->
+            <object
+                id="uml.CallBehaviorAction"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.CallBehaviorAction"/>
+            </object>
+
+            <!-- "uml.Comment" -->
+            <object
+                id="uml.Comment"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Comment"/>
+            </object>
+
+            <!-- "uml.ConditionalNode" -->
+            <object
+                id="uml.ConditionalNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ConditionalNode"/>
+            </object>
+
+            <!-- "uml.DecisionNode" -->
+            <object
+                id="uml.DecisionNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.DecisionNode"/>
+            </object>
+
+            <!-- "uml.FlowFinalNode" -->
+            <object
+                id="uml.FlowFinalNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.FlowFinalNode"/>
+            </object>
+
+            <!-- "uml.ForkNode" -->
+            <object
+                id="uml.ForkNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ForkNode"/>
+            </object>
+
+            <!-- "uml.InitialNode" -->
+            <object
+                id="uml.InitialNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.InitialNode"/>
+            </object>
+
+            <!-- "uml.JoinNode" -->
+            <object
+                id="uml.JoinNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.JoinNode"/>
+            </object>
+
+            <!-- "uml.LoopNode" -->
+            <object
+                id="uml.LoopNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.LoopNode"/>
+            </object>
+
+            <!-- "uml.MergeNode" -->
+            <object
+                id="uml.MergeNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.MergeNode"/>
+            </object>
+
+            <!-- "uml.NamedElement" -->
+            <object
+                id="uml.NamedElement"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.NamedElement"/>
+            </object>
+
+            <!-- "uml.Activity" -->
+            <object
+                id="uml.Activity"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Activity"/>
+            </object>
+
+            <!-- "uml.SequenceNode" -->
+            <object
+                id="uml.SequenceNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.SequenceNode"/>
+            </object>
+
+            <!-- "uml.Constraint" -->
+            <object
+                id="uml.Constraint"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Constraint"/>
+            </object>
+
+            <!-- "uml.Parameter" -->
+            <object
+                id="uml.Parameter"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Parameter"/>
+            </object>
+
+            <!-- "uml.ControlFlow" -->
+            <object
+                id="uml.ControlFlow"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ControlFlow"/>
+            </object>
+
+            <!-- Additional activation contexts for nodes semantic objects -->
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                elements="uml.ActivityFinalNode, uml.CallBehaviorAction, uml.Comment, uml.ConditionalNode, uml.DecisionNode, uml.FlowFinalNode, uml.ForkNode, uml.InitialNode, uml.JoinNode, uml.LoopNode, uml.MergeNode, uml.NamedElement, uml.Activity, uml.SequenceNode, uml.Constraint, uml.Parameter"/>
+
+            <!-- Additional activation contexts for edges semantic objects -->
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Edge"
+                elements="uml.ControlFlow"/>
+
+        </viewProvider>
+    </extension>
+
+    <!-- Diagram edit part providers declaration -->
+    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+
+        <!-- Diagram edit part provider -->
+        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPartProvider">
+            <Priority name="Low"/>
+            <object
+                id="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"
+                class="org.eclipse.gmf.runtime.notation.Diagram">
+                <method
+                    name="getType()"
+                    value=""/>
+            </object>
+            <context views="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"/>
+        </editpartProvider>
+
+        <!-- EditPartProvider for inherited elements (from ActivityDiagram) -->
+        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramEditPartProvider">
+            <Priority name="Low"/>
+            <!-- The semantic hints given here are used in case the provider is not already loaded. As soon as the provider is loaded its provides method is used. 
+                "3005" = ACTIVITY_FINAL_NODE_CN "5081" = ACTIVITY_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3008" = CALL_BEHAVIOR_ACTION_CN "5004" = CALL_BEHAVIOR_ACTION_CN_LABEL_NAME_HINT 
+                "3080" = COMMENT_CN "5138" = COMMENT_CN_LABEL_BODY_LABEL_HINT "3069" = CONDITIONAL_NODE_CN "5119" = CONDITIONAL_NODE_CN_LABEL_KEYWORD_HINT "7008" = CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT 
+                "3038" = DECISION_NODE_CN "5043" = DECISION_NODE_CN_LABEL_DECISION_INPUT_HINT "5098" = DECISION_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3006" = FLOW_FINAL_NODE_CN 
+                "5082" = FLOW_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3040" = FORK_NODE_CN "5100" = FORK_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3004" = INITIAL_NODE_CN "5080" 
+                = INITIAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3041" = JOIN_NODE_CN "5042" = JOIN_NODE_CN_LABEL_JOIN_SPEC_HINT "5101" = JOIN_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT 
+                "3071" = LOOP_NODE_CN "5121" = LOOP_NODE_CN_LABEL_KEYWORD_HINT "7010" = LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3039" = MERGE_NODE_CN "5099" 
+                = MERGE_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3085" = SHAPE_NAMED_ELEMENT_CN "5129" = SHAPE_NAMED_ELEMENT_CN_LABEL_NAME_HINT "2001" = ACTIVITY "5001" = ACTIVITY_LABEL_NAME_HINT 
+                "5002" = ACTIVITY_LABEL_IS_SINGLE_EXECUTION_HINT "7001" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT "7002" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT 
+                "7003" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT "7004" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT "3073" = SEQUENCE_NODE_CN "5123" = SEQUENCE_NODE_CN_LABEL_KEYWORD_HINT 
+                "7012" = SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3112" = CONSTRAINT_CN "5189" = CONSTRAINT_CN_LABEL_NAME_HINT "5190" = CONSTRAINT_CN_LABEL_BODY_HINT -->
+            <object
+                id="ACTIVITY_FINAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3005, 5081"/>
+            </object>
+            <object
+                id="CALL_BEHAVIOR_ACTION_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3008, 5004"/>
+            </object>
+            <object
+                id="COMMENT_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3080, 5138"/>
+            </object>
+            <object
+                id="CONDITIONAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3069, 5119, 7008"/>
+            </object>
+            <object
+                id="DECISION_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3038, 5043, 5098"/>
+            </object>
+            <object
+                id="FLOW_FINAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3006, 5082"/>
+            </object>
+            <object
+                id="FORK_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3040, 5100"/>
+            </object>
+            <object
+                id="INITIAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3004, 5080"/>
+            </object>
+            <object
+                id="JOIN_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3041, 5042, 5101"/>
+            </object>
+            <object
+                id="LOOP_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3071, 5121, 7010"/>
+            </object>
+            <object
+                id="MERGE_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3039, 5099"/>
+            </object>
+            <object
+                id="SHAPE_NAMED_ELEMENT_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3085, 5129"/>
+            </object>
+            <object
+                id="ACTIVITY"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="2001, 5001, 5002, 7001, 7002, 7003, 7004"/>
+            </object>
+            <object
+                id="SEQUENCE_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3073, 5123, 7012"/>
+            </object>
+            <object
+                id="CONSTRAINT_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3112, 5189, 5190"/>
+            </object>
+
+            <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN -->
+            <object
+                id="ACTIVITY_PARAMETER_CLN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3001"/>
+            </object>
+            <object
+                id="ACTIVITY_CONSTRAINT_CLN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3002"/>
+            </object>
+            <object
+                id="ACTIVITY_CONSTRAINT_CLN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3003"/>
+            </object>
+
+            <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW "6003" = CONTROL_FLOW_LABEL_NAME_HINT "6004" = CONTROL_FLOW_LABEL_WEIGHT_HINT "6009" = 
+                CONTROL_FLOW_LABEL_GUARD_HINT "6011" = CONTROL_FLOW_LABEL_APPLIED_STEREOTYPE_HINT "6013" = CONTROL_FLOW_LABEL_INTERRUPTIBLE_ICON_HINT -->
+            <object
+                id="COMMENT_ANNOTATED_ELEMENT"
+                class="org.eclipse.gmf.runtime.notation.Edge">
+                <method
+                    name="getType()"
+                    value="4006"/>
+            </object>
+            <object
+                id="CONTROL_FLOW"
+                class="org.eclipse.gmf.runtime.notation.Edge">
+                <method
+                    name="getType()"
+                    value="4004, 6003, 6004, 6009, 6011, 6013"/>
+            </object>
+
+            <context
+                views="ACTIVITY_FINAL_NODE_CN, CALL_BEHAVIOR_ACTION_CN, COMMENT_CN, CONDITIONAL_NODE_CN, DECISION_NODE_CN, FLOW_FINAL_NODE_CN, FORK_NODE_CN, INITIAL_NODE_CN, JOIN_NODE_CN, LOOP_NODE_CN, MERGE_NODE_CN, NAMED_ELEMENT_CN, ACTIVITY, SEQUENCE_NODE_CN, CONSTRAINT_CN"/>
+            <context views="ACTIVITY_PARAMETER_CLN, ACTIVITY_CONSTRAINT_CLN, ACTIVITY_CONSTRAINT_CLN"/>
+            <context views="COMMENT_ANNOTATED_ELEMENT, CONTROL_FLOW"/>
+
+        </editpartProvider>
+    </extension>
+
+    <!-- Diagram edit policy provider -->
+    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+        <editpolicyProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPolicyProvider">
+            <Priority name="Low"/>
+        </editpolicyProvider>
+    </extension>
+
+    <!-- Preference pages declaration -->
+    <extension
+        point="org.eclipse.ui.preferencePages"
+        id="prefpages">
+
+        <!-- Diagram Preference pages declaration -->
+        <page
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            name="InteractionOverviewDiagram Diagram"
+            category="org.eclipse.papyrus.preferences.diagrams"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InteractionOverviewDiagramGeneralPreferencePage">
+        </page>
+
+        <!-- Element Preference pages declaration -->
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage"
+            name="ActivityFinalNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage"
+            name="CallBehaviorAction">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage"
+            name="Comment">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage"
+            name="ConditionalNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage"
+            name="DecisionNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage"
+            name="FlowFinalNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage"
+            name="ForkNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage"
+            name="InitialNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage"
+            name="JoinNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage"
+            name="LoopNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage"
+            name="MergeNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage"
+            name="NamedElement">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage"
+            name="Activity">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage"
+            name="SequenceNode">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"
+            name="Constraint">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage"
+            name="CommentAnnotatedElement">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage"
+            name="ControlFlow">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ParameterPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ParameterPreferencePage"
+            name="Parameter">
+        </page>
+
+
+    </extension>
+
+    <!-- // Start of user code custom extensions -->
+
+    <!-- Insert custom extensions here. -->
+
+    <!-- // End of user code -->
+
+</plugin>
\ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties
new file mode 100644
index 00000000000..3b1893776a3
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
+##################################################################################
+pluginName=Interaction Overview Diagram
+providerName=Eclipse Modeling Project
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
new file mode 100644
index 00000000000..48774b2733d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
@@ -0,0 +1,725 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+

+    <!-- Diagram declaration -->

+    <extension point="org.eclipse.papyrus.infra.core.papyrusDiagram">

+        <creationCommand

+            creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand"

+            creationCondition="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreationCondition"

+            icon="icons/obj16/interactionOverviewDiagram.gif"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"

+            label="UML Interaction Overview Diagram"

+            language="uml"/>

+        <editorDiagram

+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

+            factoryClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramEditorFactory"

+            icon="icons/obj16/interactionOverviewDiagram.gif"/>

+    </extension>

+

+    <!-- Diagram creation command and handler -->

+    <extension point="org.eclipse.ui.commands">

+        <command

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"

+            name="Create a new Interaction Overview Diagram"

+            description="Create a new Interaction Overview Diagram"

+            categoryId="org.eclipse.papyrus.editor.category"/>

+    </extension>

+

+    <extension point="org.eclipse.ui.handlers">

+        <handler

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateInteractionOverviewDiagramWithNavigationHandler"

+            commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand">

+            <activeWhen>

+                <with variable="activeEditorId">

+                    <equals value="org.eclipse.papyrus.infra.core.papyrusEditor"/>

+                </with>

+            </activeWhen>

+        </handler>

+    </extension>

+

+    <!-- Diagram creation command registration in menu and toolbar -->

+    <extension point="org.eclipse.ui.menus">

+

+        <menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">

+            <menu

+                id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams"

+                label="Diagrams">

+                <command

+                    commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"

+                    icon="icons/obj16/interactionOverviewDiagram.gif"

+                    label="Create a new Interaction Overview Diagram"

+                    style="push"

+                    tooltip="Create a new Interaction Overview Diagram">

+                    <visibleWhen>

+                        <reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

+                    </visibleWhen>

+

+                </command>

+            </menu>

+        </menuContribution>

+

+        <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">

+            <toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar">

+                <command

+                    commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"

+                    icon="icons/obj16/interactionOverviewDiagram.gif"

+                    label="Create a new Interaction Overview Diagram"

+                    style="push"

+                    tooltip="Create a new Interaction Overview Diagram">

+                    <visibleWhen>

+                        <reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

+                    </visibleWhen>

+

+                </command>

+            </toolbar>

+        </menuContribution>

+

+        <menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">

+            <command

+                commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"

+                icon="icons/obj16/interactionOverviewDiagram.gif"

+                label="Create a new Interaction Overview Diagram"

+                style="push"

+                tooltip="Create a new Interaction Overview Diagram">

+                <visibleWhen>

+                    <reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

+                </visibleWhen>

+

+            </command>

+        </menuContribution>

+

+    </extension>

+

+    <!-- Palette tool declaration (declares the real palette containment) -->

+    <extension

+        point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"

+        name="UML_InteractionOverviewDiagram">

+

+        <paletteDefinition

+            ID="UML_InteractionOverviewDiagram"

+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"

+            name="UML_InteractionOverviewDiagram"

+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+            path="palettes/interactionoverviewdiagram.palette.xml"

+            provider="CEA LIST">

+            <Priority name="Low"/>

+

+            <!-- Specify diagram this palette tools relate to -->

+            <editor id="org.eclipse.papyrus.uml.diagram.interactionoverview"/>

+        </paletteDefinition>

+    </extension>

+

+    <!-- Diagram view providers declaration -->

+    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">

+        <!-- Diagram view provider -->

+        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomViewProvider">

+            <Priority name="Low"/>

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Diagram"

+                semanticHints=""/>

+        </viewProvider>

+

+        <!-- ViewProvider for inherited elements (from ActivityDiagram ViewProvider) -->

+        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramViewProvider">

+            <Priority name="Low"/>

+

+            <!-- "3005" = ACTIVITY_FINAL_NODE_CN "3008" = CALL_BEHAVIOR_ACTION_CN "3080" = COMMENT_CN "3069" = CONDITIONAL_NODE_CN "3038" = DECISION_NODE_CN "3006" 

+                = FLOW_FINAL_NODE_CN "3040" = FORK_NODE_CN "3004" = INITIAL_NODE_CN "3041" = JOIN_NODE_CN "3071" = LOOP_NODE_CN "3039" = MERGE_NODE_CN "3085" = SHAPE_NAMED_ELEMENT_CN 

+                "2001" = ACTIVITY "3073" = SEQUENCE_NODE_CN "3112" = CONSTRAINT_CN -->

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Node"

+                semanticHints="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112"/>

+

+            <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN -->

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Node"

+                semanticHints="3001, 3002, 3003"/>

+

+            <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW -->

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Edge"

+                semanticHints="4006, 4004"/>

+

+            <object

+                id="elementtype.node"

+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">

+

+                <method

+                    name="getSemanticHint()"

+                    value="3005, 3008, 3080, 3069, 3038, 3006, 3040, 3004, 3041, 3071, 3039, 3085, 2001, 3073, 3112">
+                </method>

+            </object>

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Node"

+                elements="elementtype.node"/>

+

+            <object

+                id="elementtype.edge"

+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">

+

+                <method

+                    name="getSemanticHint()"

+                    value="4006, 4004">

+                </method>

+            </object>

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Edge"

+                elements="elementtype.edge"/>

+

+

+            <!-- Additional descriptors provided in case the semantic hint is is not provided -->

+

+            <!-- "uml.ActivityFinalNode" -->

+            <object

+                id="uml.ActivityFinalNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.ActivityFinalNode"/>

+            </object>

+

+            <!-- "uml.CallBehaviorAction" -->

+            <object

+                id="uml.CallBehaviorAction"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.CallBehaviorAction"/>

+            </object>

+

+            <!-- "uml.Comment" -->

+            <object

+                id="uml.Comment"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.Comment"/>

+            </object>

+

+            <!-- "uml.ConditionalNode" -->

+            <object

+                id="uml.ConditionalNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.ConditionalNode"/>

+            </object>

+

+            <!-- "uml.DecisionNode" -->

+            <object

+                id="uml.DecisionNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.DecisionNode"/>

+            </object>

+

+            <!-- "uml.FlowFinalNode" -->

+            <object

+                id="uml.FlowFinalNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.FlowFinalNode"/>

+            </object>

+

+            <!-- "uml.ForkNode" -->

+            <object

+                id="uml.ForkNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.ForkNode"/>

+            </object>

+

+            <!-- "uml.InitialNode" -->

+            <object

+                id="uml.InitialNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.InitialNode"/>

+            </object>

+

+            <!-- "uml.JoinNode" -->

+            <object

+                id="uml.JoinNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.JoinNode"/>

+            </object>

+

+            <!-- "uml.LoopNode" -->

+            <object

+                id="uml.LoopNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.LoopNode"/>

+            </object>

+

+            <!-- "uml.MergeNode" -->

+            <object

+                id="uml.MergeNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.MergeNode"/>

+            </object>

+

+            <!-- "uml.NamedElement" -->

+            <object

+                id="uml.NamedElement"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.NamedElement"/>

+            </object>

+

+            <!-- "uml.Activity" -->

+            <object

+                id="uml.Activity"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.Activity"/>

+            </object>

+

+            <!-- "uml.SequenceNode" -->

+            <object

+                id="uml.SequenceNode"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.SequenceNode"/>

+            </object>

+

+            <!-- "uml.Constraint" -->
+            <object

+                id="uml.Constraint"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.Constraint"/>
+            </object>

+

+            <!-- "uml.Parameter" -->
+            <object

+                id="uml.Parameter"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.Parameter"/>
+            </object>

+

+            <!-- "uml.ControlFlow" -->

+            <object

+                id="uml.ControlFlow"

+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

+                <method

+                    name="getProxyClassID()"

+                    value="uml.ControlFlow"/>

+            </object>

+

+            <!-- Additional activation contexts for nodes semantic objects -->

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Node"

+                elements="uml.ActivityFinalNode, uml.CallBehaviorAction, uml.Comment, uml.ConditionalNode, uml.DecisionNode, uml.FlowFinalNode, uml.ForkNode, uml.InitialNode, uml.JoinNode, uml.LoopNode, uml.MergeNode, uml.NamedElement, uml.Activity, uml.SequenceNode, uml.Constraint, uml.Parameter"/>
+

+            <!-- Additional activation contexts for edges semantic objects -->

+            <context

+                viewClass="org.eclipse.gmf.runtime.notation.Edge"

+                elements="uml.ControlFlow"/>

+

+        </viewProvider>

+    </extension>

+

+    <!-- Diagram edit part providers declaration -->

+    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">

+

+        <!-- Diagram edit part provider -->

+        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InteractionOverviewDiagramEditPartProvider">

+            <Priority name="Low"/>

+            <object

+                id="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"

+                class="org.eclipse.gmf.runtime.notation.Diagram">

+                <method

+                    name="getType()"

+                    value="InteractionOverviewDiagram"/>

+            </object>

+            <context views="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"/>

+        </editpartProvider>

+

+        <!-- EditPartProvider for inherited elements (from ActivityDiagram) -->

+        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramEditPartProvider">

+            <Priority name="Low"/>

+            <!-- The semantic hints given here are used in case the provider is not already loaded. As soon as the provider is loaded its provides method is used. 

+                "3005" = ACTIVITY_FINAL_NODE_CN "5081" = ACTIVITY_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3008" = CALL_BEHAVIOR_ACTION_CN "5004" = CALL_BEHAVIOR_ACTION_CN_LABEL_NAME_HINT 

+                "3080" = COMMENT_CN "5138" = COMMENT_CN_LABEL_BODY_LABEL_HINT "3069" = CONDITIONAL_NODE_CN "5119" = CONDITIONAL_NODE_CN_LABEL_KEYWORD_HINT "7008" = CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT 

+                "3038" = DECISION_NODE_CN "5043" = DECISION_NODE_CN_LABEL_DECISION_INPUT_HINT "5098" = DECISION_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3006" = FLOW_FINAL_NODE_CN 

+                "5082" = FLOW_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3040" = FORK_NODE_CN "5100" = FORK_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3004" = INITIAL_NODE_CN "5080" 

+                = INITIAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3041" = JOIN_NODE_CN "5042" = JOIN_NODE_CN_LABEL_JOIN_SPEC_HINT "5101" = JOIN_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT 

+                "3071" = LOOP_NODE_CN "5121" = LOOP_NODE_CN_LABEL_KEYWORD_HINT "7010" = LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3039" = MERGE_NODE_CN "5099" 

+                = MERGE_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT "3085" = SHAPE_NAMED_ELEMENT_CN "5129" = SHAPE_NAMED_ELEMENT_CN_LABEL_NAME_HINT "2001" = ACTIVITY "5001" = ACTIVITY_LABEL_NAME_HINT 

+                "5002" = ACTIVITY_LABEL_IS_SINGLE_EXECUTION_HINT "7001" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT "7002" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT 

+                "7003" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT "7004" = ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT "3073" = SEQUENCE_NODE_CN "5123" = SEQUENCE_NODE_CN_LABEL_KEYWORD_HINT 

+                "7012" = SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT "3112" = CONSTRAINT_CN "5189" = CONSTRAINT_CN_LABEL_NAME_HINT "5190" = CONSTRAINT_CN_LABEL_BODY_HINT -->
+            <object

+                id="ACTIVITY_FINAL_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3005, 5081"/>

+            </object>

+            <object

+                id="CALL_BEHAVIOR_ACTION_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3008, 5004"/>

+            </object>

+            <object

+                id="COMMENT_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3080, 5138"/>

+            </object>

+            <object

+                id="CONDITIONAL_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3069, 5119, 7008"/>

+            </object>

+            <object

+                id="DECISION_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3038, 5043, 5098"/>

+            </object>

+            <object

+                id="FLOW_FINAL_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3006, 5082"/>

+            </object>

+            <object

+                id="FORK_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3040, 5100"/>

+            </object>

+            <object

+                id="INITIAL_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3004, 5080"/>

+            </object>

+            <object

+                id="JOIN_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3041, 5042, 5101"/>

+            </object>

+            <object

+                id="LOOP_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3071, 5121, 7010"/>

+            </object>

+            <object

+                id="MERGE_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3039, 5099"/>

+            </object>

+            <object

+                id="SHAPE_NAMED_ELEMENT_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3085, 5129"/>

+            </object>

+            <object

+                id="ACTIVITY"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="5001, 5002, 7001, 7002, 7003, 7004"/>

+            </object>

+            <object

+                id="SEQUENCE_NODE_CN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3073, 5123, 7012"/>

+            </object>

+            <object
+                id="CONSTRAINT_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="3112, 5189, 5190"/>
+            </object>
+

+            <!-- "3001" = ACTIVITY_PARAMETER_CLN "3002" = ACTIVITY_CONSTRAINT_CLN "3003" = ACTIVITY_CONSTRAINT_CLN -->

+            <object

+                id="ACTIVITY_PARAMETER_CLN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3001"/>

+            </object>

+            <object

+                id="ACTIVITY_CONSTRAINT_CLN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3002"/>

+            </object>

+            <object

+                id="ACTIVITY_CONSTRAINT_CLN"

+                class="org.eclipse.gmf.runtime.notation.Node">

+                <method

+                    name="getType()"

+                    value="3003"/>

+            </object>

+

+            <!-- "4006" = COMMENT_ANNOTATED_ELEMENT "4004" = CONTROL_FLOW "6003" = CONTROL_FLOW_LABEL_NAME_HINT "6004" = CONTROL_FLOW_LABEL_WEIGHT_HINT "6009" = 

+                CONTROL_FLOW_LABEL_GUARD_HINT "6011" = CONTROL_FLOW_LABEL_APPLIED_STEREOTYPE_HINT "6013" = CONTROL_FLOW_LABEL_INTERRUPTIBLE_ICON_HINT -->

+            <object

+                id="COMMENT_ANNOTATED_ELEMENT"

+                class="org.eclipse.gmf.runtime.notation.Edge">

+                <method

+                    name="getType()"

+                    value="4006"/>

+            </object>

+            <object

+                id="CONTROL_FLOW"

+                class="org.eclipse.gmf.runtime.notation.Edge">

+                <method

+                    name="getType()"

+                    value="4004, 6003, 6004, 6009, 6011, 6013"/>

+            </object>

+

+            <context

+                views="ACTIVITY_FINAL_NODE_CN, CALL_BEHAVIOR_ACTION_CN, COMMENT_CN, CONDITIONAL_NODE_CN, DECISION_NODE_CN, FLOW_FINAL_NODE_CN, FORK_NODE_CN, INITIAL_NODE_CN, JOIN_NODE_CN, LOOP_NODE_CN, MERGE_NODE_CN, NAMED_ELEMENT_CN, SEQUENCE_NODE_CN, CONSTRAINT_CN"/>
+            <context views="ACTIVITY_PARAMETER_CLN, ACTIVITY_CONSTRAINT_CLN, ACTIVITY_CONSTRAINT_CLN"/>

+            <context views="COMMENT_ANNOTATED_ELEMENT, CONTROL_FLOW"/>

+

+        </editpartProvider>

+    </extension>

+

+<extension

+       id="custom-ep-provider"

+       point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">

+       <editpartProvider

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPartProvider">

+            <Priority name="Medium"/>

+			<object

+	     		class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"

+		    	id="customized-edit-parts">

+		    	<!-- 2001 = ActivityEditPartTN -->

+			    <method name="getType()" value="2001"/>

+		   </object>

+		   <context views="customized-edit-parts"/>

+	   </editpartProvider>

+   </extension>

+

+    <!-- Diagram edit policy provider -->

+    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">

+        <editpolicyProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPolicyProvider">
+            <Priority name="Low"/>

+        </editpolicyProvider>

+    </extension>

+

+    <!-- Preference pages declaration -->

+    <extension

+        point="org.eclipse.ui.preferencePages"

+        id="prefpages">

+

+        <!-- Diagram Preference pages declaration -->

+        <page

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            name="InteractionOverviewDiagram Diagram"

+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InteractionOverviewDiagramGeneralPreferencePage">

+        </page>

+

+        <!-- Element Preference pages declaration -->

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage"

+            name="ActivityFinalNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage"

+            name="CallBehaviorAction">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage"

+            name="Comment">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage"

+            name="ConditionalNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage"

+            name="DecisionNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage"

+            name="FlowFinalNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage"

+            name="ForkNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage"

+            name="InitialNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage"

+            name="JoinNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage"

+            name="LoopNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage"

+            name="MergeNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage"

+            name="NamedElement">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage"

+            name="Activity">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage"

+            name="SequenceNode">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"
+            name="Constraint">
+        </page>
+
+
+        <page
+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage"

+            name="CommentAnnotatedElement">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage"

+            name="ControlFlow">

+        </page>

+

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ParameterPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ParameterPreferencePage"

+            name="Parameter">

+        </page>

+

+        <page

+            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"

+            name="Constraint">

+        </page>

+

+

+    </extension>

+

+    <!-- // Start of user code custom extensions -->

+

+	   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

+      <?gmfgen generated="true"?>

+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomUMLParserProvider">

+         <Priority name="Low"/>

+      </ParserProvider>

+   </extension>

+    <!-- Insert custom extensions here. -->

+

+    <!-- // End of user code -->

+

+</plugin>

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.java
new file mode 100644
index 00000000000..e91c104d089
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.java
@@ -0,0 +1,110 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview;
+
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InteractionOverviewDiagramPreferenceInitializer;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/** The activator class controls the plug-in life cycle */
+public class Activator extends AbstractUIPlugin {
+
+	/** The plug-in ID */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.interactionoverview";
+
+	/** The plug-in shared instance */
+	private static Activator plugin;
+
+	/** The logging helper */
+	public static LogHelper log;
+
+	/** The plug-in Preference store */
+	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(PLUGIN_ID);
+
+	/** Default constructor */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
+	 * )
+	 */
+	@Override
+	public void start(final BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+
+		// register the login helper
+		log = new LogHelper(plugin);
+
+		// register the preference store
+		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
+
+		// Preferences initialization
+		final InteractionOverviewDiagramPreferenceInitializer diagramPreferenceInitializer = new InteractionOverviewDiagramPreferenceInitializer();
+		diagramPreferenceInitializer.initializeDefaultPreferences();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
+	 * )
+	 */
+	@Override
+	public void stop(final BundleContext context) throws Exception {
+		log = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 * 
+	 * @return the shared instance
+	 */
+	public static Activator getInstance() {
+		return plugin;
+	}
+
+	/**
+	 * 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(final String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
+	 * 
+	 * @return Shared Preference Store.
+	 */
+	@Override
+	public IPreferenceStore getPreferenceStore() {
+		final IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
+		return store;
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreateCommand.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreateCommand.java
new file mode 100644
index 00000000000..2363c9481f8
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreateCommand.java
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+// Start of user code custom imports
+//  End of user code
+
+public class InteractionOverviewDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getDefaultDiagramName() {
+		return "InteractionOverviewDiagram"; //$NON-NLS-1$
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getDiagramNotationID() {
+		return ElementTypes.DIAGRAM_ID;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected PreferencesHint getPreferenceHint() {
+		return Activator.DIAGRAM_PREFERENCES_HINT;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Diagram createDiagram(final Resource diagramResource, final EObject owner, final String name) {
+		// Start of user code Custom diagram creation
+		return super.createDiagram(diagramResource, owner, name);
+		// End of user code
+	}
+
+	// Start of user code Custom creation command
+
+	// End of user code
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramEditorFactory.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramEditorFactory.java
new file mode 100644
index 00000000000..4c79961fa49
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramEditorFactory.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class InteractionOverviewDiagramEditorFactory extends GmfEditorFactory {
+
+	public InteractionOverviewDiagramEditorFactory() {
+		super(InteractionOverviewDiagramForMultiEditor.class, ElementTypes.DIAGRAM_ID);
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramForMultiEditor.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramForMultiEditor.java
new file mode 100644
index 00000000000..0047f955a54
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramForMultiEditor.java
@@ -0,0 +1,114 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.ui.URIEditorInput;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.part.InteractionOverviewDiagramEditor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * An editor to be used in multitabs editor. This editor extends the original
+ * UML Diagram.
+ * 
+ */
+public class InteractionOverviewDiagramForMultiEditor extends InteractionOverviewDiagramEditor {
+
+	/**
+	 * The location of diagram icon in the plug-in
+	 */
+	private static final String DIAG_IMG_PATH = "";
+
+	/**
+	 * The image descriptor of the diagram icon
+	 */
+	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(InteractionOverviewDiagramForMultiEditor.DIAG_IMG_PATH);
+
+	/** The editor splitter. */
+	private Composite splitter;
+
+	/**
+	 * Constructor for SashSystem v2. Context and required objects are retrieved
+	 * from the ServiceRegistry.
+	 * 
+	 * @throws BackboneException
+	 * @throws ServiceException
+	 * 
+	 */
+	public InteractionOverviewDiagramForMultiEditor(final ServicesRegistry servicesRegistry, final Diagram diagram) throws BackboneException, ServiceException {
+		super(servicesRegistry, diagram);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(final IEditorSite site, final IEditorInput input) throws PartInitException {
+		super.init(site, input);
+		setPartName(getDiagram().getName());
+		setTitleImage(DIAG_IMG_DESC.createImage());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setInput(final IEditorInput input) {
+		try {
+			// Provide an URI with fragment in order to reuse the same Resource
+			// and set the diagram to the fragment.
+			final URIEditorInput uriInput = new URIEditorInput(EcoreUtil.getURI(getDiagram()));
+			doSetInput(uriInput, true);
+		} catch (final CoreException x) {
+			final String title = "Problem opening";
+			final String msg = "Cannot open input element:";
+			final Shell shell = getSite().getShell();
+			ErrorDialog.openError(shell, title, msg, x.getStatus());
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void createGraphicalViewer(final Composite parent) {
+		splitter = parent;
+		super.createGraphicalViewer(parent);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setFocus() {
+		splitter.setFocus();
+		super.setFocus();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getEditingDomainID() {
+		return "org.eclipse.papyrus.uml.diagram.interactionoverview.EditingDomain";
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.java
new file mode 100644
index 00000000000..8ea6d04f0f5
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/InteractionOverviewDiagramEditPart.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomInteractionOverviewDiagramCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy.DiagramSemanticEditPolicy;
+
+public class InteractionOverviewDiagramEditPart extends DiagramEditPart {
+
+	public static String MODEL_ID = "PapyrusUMLInteractionOverviewDiagram";
+
+	public static final int VISUAL_ID = 1000;
+
+	public InteractionOverviewDiagramEditPart(final View view) {
+		super(view);
+	}
+
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());
+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
+		installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE, new CustomInteractionOverviewDiagramCreationEditPolicy());
+		removeEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE);
+		removeEditPolicy(EditPolicyRoles.POPUPBAR_ROLE);
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java
new file mode 100644
index 00000000000..58dbb2599cf
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+// Start of user code custom imports	
+// End of user code
+
+public class DiagramSemanticEditPolicy extends SemanticEditPolicy {
+
+	protected Command getCreateCommand(final CreateElementRequest req) {
+
+		final IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.Package_1000);
+		if(commandService == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Start of user code custom creation commands
+		// End of user code
+
+		if(ElementTypes.ACTIVITY == req.getElementType()) {
+			final CreateElementRequest createRequest = new CreateElementRequest(req.getContainer(), UMLElementTypes.Activity_2001);
+			return new ICommandProxy(commandService.getEditCommand(createRequest));
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/InteractionOverviewDiagramDragDropEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/InteractionOverviewDiagramDragDropEditPolicy.java
new file mode 100644
index 00000000000..afa0e6cc736
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/InteractionOverviewDiagramDragDropEditPolicy.java
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.GraphicalTypeRegistry;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.IGraphicalTypeRegistry;
+
+/**
+ * Customization of the DND edit policy for the InteractionOverviewDiagram
+ * Diagram
+ */
+public class InteractionOverviewDiagramDragDropEditPolicy extends CustomDiagramDragDropEditPolicy {
+
+	/** Local graphical type registry */
+	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int getNodeVisualID(final View containerView, final EObject domainElement) {
+		final String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
+		if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+			return -1; // undefined
+		}
+		return new Integer(domainType);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int getLinkWithClassVisualID(final EObject domainElement) {
+		final String domainType = registry.getEdgeGraphicalType(domainElement);
+		if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
+			return -1; // undefined
+		}
+		return new Integer(domainType);
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.java
new file mode 100644
index 00000000000..c00f984d212
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.java
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.factory;
+
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
+import org.eclipse.gmf.runtime.notation.MeasurementUnit;
+
+public class InteractionOverviewDiagramViewFactory extends DiagramViewFactory {
+
+	// Start of user code Custom view Factory field
+	// End of user code
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected MeasurementUnit getMeasurementUnit() {
+		return MeasurementUnit.PIXEL_LITERAL;
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor.java
new file mode 100644
index 00000000000..77cf62f68b5
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/part/InteractionOverviewDiagramEditor.java
@@ -0,0 +1,510 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.part;
+
+import java.util.EventObject;
+import java.util.Set;
+
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.KeyHandler;
+import org.eclipse.gef.Tool;
+import org.eclipse.gef.commands.CommandStackListener;
+import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.ui.palette.PaletteViewer;
+import org.eclipse.gef.ui.palette.PaletteViewerProvider;
+import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
+import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
+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.internal.parts.PaletteToolTransferDragSourceListener;
+import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;
+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.TransferData;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.ShowInContext;
+
+/**
+ * @generated
+ */
+public class InteractionOverviewDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
+
+	/**
+	 * @generated
+	 */
+	public static final String ID = "org.eclipse.papyrus.uml.diagram.interactionoverview.part.InteractionOverviewDiagramEditorID"; //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	private KeyHandler paletteKeyHandler = null;
+
+	/**
+	 * @generated
+	 */
+	private MouseListener paletteMouseListener = null;
+
+	/**
+	 * @generated
+	 */
+	private IUndoableOperation savedOperation = null;
+
+	/**
+	 * @generated
+	 */
+	private final TransactionalEditingDomain editingDomain;
+
+	/**
+	 * @generated
+	 */
+	private final IDocumentProvider documentProvider;
+
+	/**
+	 * @generated
+	 */
+	public InteractionOverviewDiagramEditor(final ServicesRegistry servicesRegistry, final Diagram diagram) throws ServiceException {
+		super(servicesRegistry, diagram);
+
+		// adds a listener to the palette service, which reacts to palette
+		// customizations
+		PapyrusPaletteService.getInstance().addProviderChangeListener(this);
+
+		// Share the same editing provider
+		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);
+		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);
+
+		// overrides editing domain created by super constructor
+		setDocumentProvider(documentProvider);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected PaletteRoot createPaletteRoot(final PaletteRoot existingPaletteRoot) {
+		PaletteRoot paletteRoot;
+		if(existingPaletteRoot == null) {
+			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
+		} else {
+			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
+			paletteRoot = existingPaletteRoot;
+		}
+		applyCustomizationsToPalette(paletteRoot);
+		return paletteRoot;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected PreferencesHint getPreferencesHint() {
+		return Activator.DIAGRAM_PREFERENCES_HINT;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getContributorId() {
+		return Activator.PLUGIN_ID;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected final IDocumentProvider getDocumentProvider(final IEditorInput input) {
+		return documentProvider;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public TransactionalEditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected final void setDocumentProvider(final IEditorInput input) {
+		// Already set in the constructor
+	}
+
+	/**
+	 * @generated
+	 */
+	public void gotoMarker(final IMarker marker) {
+		MarkerNavigationService.getInstance().gotoMarker(this, marker);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		performSaveAs(new NullProgressMonitor());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performSaveAs(final IProgressMonitor progressMonitor) {
+		// Nothing
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ShowInContext getShowInContext() {
+		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void configureGraphicalViewer() {
+		super.configureGraphicalViewer();
+
+		// Replace diagram contextual menu removing default
+		// delete from model action.
+		final DiagramContextMenuProvider provider = (DiagramContextMenuProvider)getDiagramGraphicalViewer().getContextMenu();
+		final Set<String> menuExclusions = provider.getExclusionSet();
+		menuExclusions.add(ActionIds.ACTION_DELETE_FROM_MODEL);
+		provider.setExclusionSet(menuExclusions);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected TransactionalEditingDomain createEditingDomain() {
+		// Already configured
+		return editingDomain;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void configureDiagramEditDomain() {
+		super.configureDiagramEditDomain();
+		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
+
+			public void commandStackChanged(final EventObject event) {
+				firePropertyChange(IEditorPart.PROP_DIRTY);
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void doSave(final IProgressMonitor progressMonitor) {
+		// The saving of the resource is done by the CoreMultiDiagramEditor
+		savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		final IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
+		return savedOperation != op;
+	}
+
+	/**
+	 * @generated
+	 */
+	public void providerChanged(final ProviderChangeEvent event) {
+		// update the palette if the palette service has changed
+		if(PapyrusPaletteService.getInstance().equals(event.getSource())) {
+			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		// remove palette service listener
+		// remove preference listener
+		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
+
+		super.dispose();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected PaletteViewer getPaletteViewer() {
+		return getEditDomain().getPaletteViewer();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected PaletteViewer constructPaletteViewer() {
+		return new PapyrusPaletteViewer();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected PaletteViewerProvider createPaletteViewerProvider() {
+		getEditDomain().setPaletteRoot(createPaletteRoot(null));
+		return new PaletteViewerProvider(getEditDomain()) {
+
+			/**
+			 * Override to provide the additional behavior for the tools. Will
+			 * intialize with a PaletteEditPartFactory that has a TrackDragger
+			 * that understand how to handle the mouseDoubleClick event for
+			 * shape creation tools. Also will initialize the palette with a
+			 * defaultTool that is the SelectToolEx that undestands how to
+			 * handle the enter key which will result in the creation of the
+			 * shape also.
+			 */
+			@Override
+			protected void configurePaletteViewer(final PaletteViewer viewer) {
+				super.configurePaletteViewer(viewer);
+
+				// customize menu...
+				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));
+
+				viewer.getKeyHandler().setParent(getPaletteKeyHandler());
+				viewer.getControl().addMouseListener(getPaletteMouseListener());
+
+				// Add a transfer drag target listener that is supported on
+				// palette template entries whose template is a creation tool.
+				// This will enable drag and drop of the palette shape creation
+				// tools.
+				viewer.addDragSourceListener(new PaletteToolTransferDragSourceListener(viewer));
+				viewer.setCustomizer(createPaletteCustomizer());
+			}
+
+			@Override
+			public PaletteViewer createPaletteViewer(final Composite parent) {
+				final PaletteViewer pViewer = constructPaletteViewer();
+				pViewer.createControl(parent);
+				configurePaletteViewer(pViewer);
+				hookPaletteViewer(pViewer);
+				return pViewer;
+			}
+
+			/**
+			 * @return Palette Key Handler for the palette
+			 */
+			private KeyHandler getPaletteKeyHandler() {
+
+				if(paletteKeyHandler == null) {
+
+					paletteKeyHandler = new KeyHandler() {
+
+						/**
+						 * Processes a <i>key released </i> event. This method
+						 * is called by the Tool whenever a key is released, and
+						 * the Tool is in the proper state. Override to support
+						 * pressing the enter key to create a shape or
+						 * connection (between two selected shapes)
+						 * 
+						 * @param event
+						 *        the KeyEvent
+						 * @return <code>true</code> if KeyEvent was handled in
+						 *         some way
+						 */
+						@Override
+						public boolean keyReleased(final KeyEvent event) {
+
+							if(event.keyCode == SWT.Selection) {
+
+								final Tool tool = getPaletteViewer().getActiveTool().createTool();
+
+								if(toolSupportsAccessibility(tool)) {
+
+									tool.keyUp(event, getDiagramGraphicalViewer());
+
+									// deactivate current selection
+									getPaletteViewer().setActiveTool(null);
+
+									return true;
+								}
+
+							}
+							return super.keyReleased(event);
+						}
+
+					};
+
+				}
+				return paletteKeyHandler;
+			}
+
+			/**
+			 * @return Palette Mouse listener for the palette
+			 */
+			private MouseListener getPaletteMouseListener() {
+
+				if(paletteMouseListener == null) {
+
+					paletteMouseListener = new MouseListener() {
+
+						/**
+						 * Flag to indicate that the current active tool should
+						 * be cleared after a mouse double-click event.
+						 */
+						private boolean clearActiveTool = false;
+
+						/**
+						 * Override to support double-clicking a palette tool
+						 * entry to create a shape or connection (between two
+						 * selected shapes).
+						 * 
+						 * @see MouseListener#mouseDoubleClick(MouseEvent)
+						 */
+						public void mouseDoubleClick(final MouseEvent e) {
+							final Tool tool = getPaletteViewer().getActiveTool().createTool();
+
+							if(toolSupportsAccessibility(tool)) {
+
+								tool.setViewer(getDiagramGraphicalViewer());
+								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());
+								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());
+
+								// Current active tool should be deactivated,
+								// but if it is down here it will get
+								// reactivated deep in GEF palette code after
+								// receiving mouse up events.
+								clearActiveTool = true;
+							}
+						}
+
+						public void mouseDown(final MouseEvent e) {
+							// do nothing
+						}
+
+						public void mouseUp(final MouseEvent e) {
+							// Deactivate current active tool here if a
+							// double-click was handled.
+							if(clearActiveTool) {
+								getPaletteViewer().setActiveTool(null);
+								clearActiveTool = false;
+							}
+
+						}
+					};
+
+				}
+				return paletteMouseListener;
+			}
+
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public GraphicalViewer getGraphicalViewer() {
+		return super.getGraphicalViewer();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void initializeGraphicalViewer() {
+		super.initializeGraphicalViewer();
+
+		// Enable Drop
+		getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {
+
+			@Override
+			protected Object getJavaObject(final TransferData data) {
+				return LocalSelectionTransfer.getTransfer().nativeToJava(data);
+			}
+
+			@Override
+			protected TransactionalEditingDomain getTransactionalEditingDomain() {
+				return getEditingDomain();
+			}
+		});
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(final IWorkbenchPart part, final ISelection selection) {
+		if(getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
+			final IMultiDiagramEditor editor = (IMultiDiagramEditor)getSite().getPage().getActiveEditor();
+			// If not the active editor, ignore selection changed.
+			if(this.equals(editor.getActiveEditor())) {
+				updateActions(getSelectionActions());
+				super.selectionChanged(part, selection);
+			} else {
+				super.selectionChanged(part, selection);
+			}
+		} else {
+			super.selectionChanged(part, selection);
+		}
+		// from
+		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
+		// ISelection)
+		if(part == this) {
+			rebuildStatusLine();
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.java
new file mode 100644
index 00000000000..bb16e1e3206
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.java
@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class ActivityFinalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ActivityFinalNode"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public ActivityFinalNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ActivityFinalNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.java
new file mode 100644
index 00000000000..24aacab1410
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.java
@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class ActivityPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Activity"; //$NON-NLS-1$
+
+	/** The compartments default visibility for preferences */
+	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
+
+	/** The compartment titles default visibility for preferences */
+	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentDefaultVisibilityMap.put("ActivityFigureParameterCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("ActivityFigurePreconditionCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("ActivityFigurePostCondtionCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("ActivityFigureContentCompartment", Boolean.TRUE); //$NON-NLS-1$	
+
+		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentTitleDefaultVisibilityMap.put("ActivityFigureParameterCompartment", Boolean.TRUE); //$NON-NLS-1$
+		compartmentTitleDefaultVisibilityMap.put("ActivityFigurePreconditionCompartment", Boolean.TRUE); //$NON-NLS-1$
+		compartmentTitleDefaultVisibilityMap.put("ActivityFigurePostCondtionCompartment", Boolean.TRUE); //$NON-NLS-1$
+		compartmentTitleDefaultVisibilityMap.put("ActivityFigureContentCompartment", Boolean.TRUE); //$NON-NLS-1$
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
+		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public ActivityPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Activity"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 857);
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 757);
+		// Initialize default visibility for compartments in preference page.
+		for(final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+			final String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
+		}
+
+		// Initialize default title visibility for compartments in preference
+		// page.
+		for(final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+			final String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentNamesList() {
+		for(final String name : compartmentDefaultVisibilityMap.keySet()) {
+			this.compartmentNamesList.add(name);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentTitlesList() {
+		for(final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+			this.compartmentTitlesList.add(name);
+		}
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.java
new file mode 100644
index 00000000000..b9ad9f3bab8
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class CallBehaviorActionPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CallBehaviorAction"; //$NON-NLS-1$
+
+	/** Default constructor */
+	public CallBehaviorActionPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_CallBehaviorAction"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.java
new file mode 100644
index 00000000000..554eb696ce8
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class CommentAnnotatedElementPreferencePage extends InteractionOverviewDiagramLinkPreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"; //$NON-NLS-1$
+
+	/** Default constructor */
+	public CommentAnnotatedElementPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.java
new file mode 100644
index 00000000000..baac8e6ba54
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class CommentPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
+
+	/** Default constructor */
+	public CommentPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.java
new file mode 100644
index 00000000000..b605d2a4b7b
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class ConditionalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConditionalNode"; //$NON-NLS-1$
+
+	/** The compartments default visibility for preferences */
+	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
+
+	/** The compartment titles default visibility for preferences */
+	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$	
+
+		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentTitleDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
+		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public ConditionalNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ConditionalNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		// Initialize default visibility for compartments in preference page.
+		for(final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+			final String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
+		}
+
+		// Initialize default title visibility for compartments in preference
+		// page.
+		for(final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+			final String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentNamesList() {
+		for(final String name : compartmentDefaultVisibilityMap.keySet()) {
+			this.compartmentNamesList.add(name);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentTitlesList() {
+		for(final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+			this.compartmentTitlesList.add(name);
+		}
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.java
new file mode 100644
index 00000000000..7cf0d7bf020
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class ConstraintPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
+
+	/** Default constructor */
+	public ConstraintPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.java
new file mode 100644
index 00000000000..73881f06f7a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.java
@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class ControlFlowPreferencePage extends InteractionOverviewDiagramLinkPreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ControlFlow"; //$NON-NLS-1$
+
+	/** The compartments default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("Name", Boolean.TRUE); //$NON-NLS-1$	
+		labelDefaultVisibilityMap.put("Weight", Boolean.TRUE); //$NON-NLS-1$	
+		labelDefaultVisibilityMap.put("Guard", Boolean.TRUE); //$NON-NLS-1$	
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+		labelDefaultVisibilityMap.put("undefined_role", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public ControlFlowPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ControlFlow"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.java
new file mode 100644
index 00000000000..be5392737d2
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.java
@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class DecisionNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_DecisionNode"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("undefined_role", Boolean.TRUE); //$NON-NLS-1$	
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public DecisionNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_DecisionNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.java
new file mode 100644
index 00000000000..70a1ef5304b
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.java
@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class FlowFinalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_FlowFinalNode"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public FlowFinalNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_FlowFinalNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.java
new file mode 100644
index 00000000000..56e73a92990
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.java
@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class ForkNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ForkNode"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public ForkNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ForkNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 10);
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 40);
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.java
new file mode 100644
index 00000000000..c0cf274d33e
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class InitialNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_InitialNode"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public InitialNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_InitialNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.java
new file mode 100644
index 00000000000..a9a30b4ae5a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.java
@@ -0,0 +1,21 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+
+public class InteractionOverviewDiagramGeneralPreferencePage extends DiagramPreferencePage {
+
+	public InteractionOverviewDiagramGeneralPreferencePage() {
+		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.java
new file mode 100644
index 00000000000..d5732233f78
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.java
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+import org.eclipse.swt.widgets.Composite;
+
+public class InteractionOverviewDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {
+
+	/** The list of label names for this link */
+	protected List<String> labelsList;
+
+	/** Constructor */
+	public InteractionOverviewDiagramLinkPreferencePage() {
+		labelsList = new ArrayList<String>();
+		initializeLabelsList();
+		Collections.unmodifiableList(labelsList);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void createPageContents(final Composite parent) {
+		super.createPageContents(parent);
+
+		// Add label visibility group
+		if(!labelsList.isEmpty()) {
+			final OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
+			addAbstractGroup(compartmentGroup);
+		}
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getBundleId() {
+		return Activator.PLUGIN_ID;
+	}
+
+	/** Initialize the list containing names of labels. */
+	protected void initializeLabelsList() {
+		// Implemented by subclasses.
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected final TreeMap<String, String> getLabelRole() {
+		return new TreeMap<String, String>();
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.java
new file mode 100644
index 00000000000..3d43874ad06
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.java
@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedCompartmentGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+import org.eclipse.swt.widgets.Composite;
+
+public class InteractionOverviewDiagramNodePreferencePage extends AbstractPapyrusNodePreferencePage {
+
+	/** The list owning the names of compartments */
+	protected List<String> compartmentNamesList;
+
+	/** The list owning the names of compartment that have a title */
+	protected List<String> compartmentTitlesList;
+
+	/** The list of label names for this node */
+	protected List<String> labelsList;
+
+	/** Constructor */
+	public InteractionOverviewDiagramNodePreferencePage() {
+		this.labelsList = new ArrayList<String>();
+		this.compartmentNamesList = new ArrayList<String>();
+		this.compartmentTitlesList = new ArrayList<String>();
+
+		initializeLabelsList();
+		initializeCompartmentNamesList();
+		initializeCompartmentTitlesList();
+
+		Collections.unmodifiableList(labelsList);
+		Collections.unmodifiableList(compartmentNamesList);
+		Collections.unmodifiableList(compartmentTitlesList);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void createPageContents(final Composite parent) {
+		super.createPageContents(parent);
+
+		// Add compartments visibility group
+		if(!compartmentNamesList.isEmpty()) {
+			final OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());
+			addAbstractGroup(compartmentGroup);
+		}
+
+		// Add label visibility group
+		if(!labelsList.isEmpty()) {
+			final OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
+			addAbstractGroup(compartmentGroup);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getBundleId() {
+		return Activator.PLUGIN_ID;
+	}
+
+	/** Initialize the list containing names of labels. */
+	protected void initializeLabelsList() {
+		// Implemented by subclasses.
+	}
+
+	/** Initialize the list containing the names of compartments. */
+	protected void initializeCompartmentNamesList() {
+		// Implemented by subclasses.
+	}
+
+	/**
+	 * Initialize the list containing the names of compartment that have titles.
+	 */
+	protected void initializeCompartmentTitlesList() {
+		// Implemented by subclasses.
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected final TreeMap<String, String> getLabelRole() {
+		return new TreeMap<String, String>();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected final TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
+		return new TreeMap<String, Boolean>();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected final void initializeCompartmentsList() {
+		compartmentsList = Collections.emptyList();
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.java
new file mode 100644
index 00000000000..5993ed421a6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.java
@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+
+public class InteractionOverviewDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
+
+	protected IPreferenceStore getPreferenceStore() {
+		return Activator.getInstance().getPreferenceStore();
+	}
+
+	@Override
+	public void initializeDefaultPreferences() {
+		final IPreferenceStore store = getPreferenceStore();
+
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
+		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage.initDefaults(store);
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.java
new file mode 100644
index 00000000000..20088ce9033
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.java
@@ -0,0 +1,76 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class JoinNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_JoinNode"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("undefined_role", Boolean.TRUE); //$NON-NLS-1$	
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public JoinNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_JoinNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 10);
+		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 40);
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.java
new file mode 100644
index 00000000000..9677b51f130
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class LoopNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_LoopNode"; //$NON-NLS-1$
+
+	/** The compartments default visibility for preferences */
+	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
+
+	/** The compartment titles default visibility for preferences */
+	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$	
+
+		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentTitleDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
+		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public LoopNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_LoopNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		// Initialize default visibility for compartments in preference page.
+		for(final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+			final String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
+		}
+
+		// Initialize default title visibility for compartments in preference
+		// page.
+		for(final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+			final String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentNamesList() {
+		for(final String name : compartmentDefaultVisibilityMap.keySet()) {
+			this.compartmentNamesList.add(name);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentTitlesList() {
+		for(final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+			this.compartmentTitlesList.add(name);
+		}
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.java
new file mode 100644
index 00000000000..836df7d51ff
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class MergeNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_MergeNode"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public MergeNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_MergeNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.java
new file mode 100644
index 00000000000..1b502f85276
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class NamedElementPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ShapeNamedElement"; //$NON-NLS-1$
+
+	/** The labels default visibility for preferences */
+	public static final Map<String, Boolean> labelDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+
+		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		labelDefaultVisibilityMap.put("Name", Boolean.TRUE); //$NON-NLS-1$	
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(labelDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public NamedElementPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ShapeNamedElement"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		// Initialize default visibility for labels in preference page.
+		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
+			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeLabelsList() {
+		for(final String name : labelDefaultVisibilityMap.keySet()) {
+			this.labelsList.add(name);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.java
new file mode 100644
index 00000000000..392b2f4ec48
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.java
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class ParameterPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Parameter"; //$NON-NLS-1$
+
+	/** Default constructor */
+	public ParameterPreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Parameter"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.java
new file mode 100644
index 00000000000..2b2fa8622dd
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+
+public class SequenceNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
+
+	/** Constant key to access preferences */
+	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_SequenceNode"; //$NON-NLS-1$
+
+	/** The compartments default visibility for preferences */
+	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
+
+	/** The compartment titles default visibility for preferences */
+	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
+
+	/** Static attribute initialization */
+	static {
+		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$	
+
+		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
+		compartmentTitleDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
+
+		// Start of user code custom static initializations
+		// End of user code
+
+		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
+		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
+	}
+
+	/** Default constructor */
+	public SequenceNodePreferencePage() {
+		super();
+		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_SequenceNode"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Initialize defaults using a specified {@link IPreferenceStore}
+	 * 
+	 * @param store
+	 *        the preference store.
+	 */
+	public static void initDefaults(final IPreferenceStore store) {
+		// Start of user code custom default initializations
+		// End of user code
+
+		// Initialize default visibility for compartments in preference page.
+		for(final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
+			final String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
+		}
+
+		// Initialize default title visibility for compartments in preference
+		// page.
+		for(final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
+			final String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentNamesList() {
+		for(final String name : compartmentDefaultVisibilityMap.keySet()) {
+			this.compartmentNamesList.add(name);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeCompartmentTitlesList() {
+		for(final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
+			this.compartmentTitlesList.add(name);
+		}
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.java
new file mode 100644
index 00000000000..51fa4ccf6a9
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomUMLParserProvider.java
@@ -0,0 +1,43 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;

+

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.parser.CustomCallBehaviorActionParser;

+

+

+public class CustomUMLParserProvider extends UMLParserProvider {

+

+

+

+

+

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider#getParser(int)

+	 * 

+	 * @param visualID

+	 * @return

+	 */

+

+	@Override

+	protected IParser getParser(final int visualID) {

+		switch(visualID) {

+		case CallBehaviorActionNameEditPart.VISUAL_ID:

+			return getCallBehaviorActionLabel_5004Parser();

+		default:

+			return super.getParser(visualID);

+		}

+		// TODO Auto-generated method stub

+

+	}

+

+	private IParser getCallBehaviorActionLabel_5004Parser() {

+		if(custom_callBehaviorActionLabel_5004Parser == null) {

+			final CustomCallBehaviorActionParser parser = new CustomCallBehaviorActionParser();

+			custom_callBehaviorActionLabel_5004Parser = parser;

+		}

+		return custom_callBehaviorActionLabel_5004Parser;

+	}

+

+	private IParser custom_callBehaviorActionLabel_5004Parser;

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.java
new file mode 100644
index 00000000000..8c1aaeb7ac7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/ElementTypes.java
@@ -0,0 +1,147 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+
+public class ElementTypes extends AbstractElementTypeEnumerator {
+
+	/** ********************************************************* */
+	/** Interaction Overview Diagram specific elements **************** */
+	/** ********************************************************* */
+
+	/** Interaction Overview Diagram :: Diagram */
+	public static final String DIAGRAM_ID = "2001"; //$NON-NLS-1$
+
+	/** ********************************************************* */
+	/** Interaction Overview Diagram - ActivityDiagram related elements */
+	/** ********************************************************* */
+
+	/** ActivityDiagram :: ACTIVITY_FINAL_NODE_CN */
+	public static final IHintedType ACTIVITY_FINAL_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005"); //$NON-NLS-1$
+
+	public static final String ACTIVITY_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5081"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: CALL_BEHAVIOR_ACTION_CN */
+	public static final IHintedType CALL_BEHAVIOR_ACTION_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"); //$NON-NLS-1$
+
+	public static final String CALL_BEHAVIOR_ACTION_CN_LABEL_NAME_HINT = "5004"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: COMMENT_CN */
+	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.Comment_3080"); //$NON-NLS-1$
+
+	public static final String COMMENT_CN_LABEL_BODY_LABEL_HINT = "5138"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: CONDITIONAL_NODE_CN */
+	public static final IHintedType CONDITIONAL_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069"); //$NON-NLS-1$
+
+	public static final String CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "7008"; //$NON-NLS-1$
+
+	public static final String CONDITIONAL_NODE_CN_LABEL_KEYWORD_HINT = "5119"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: DECISION_NODE_CN */
+	public static final IHintedType DECISION_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038"); //$NON-NLS-1$
+
+	public static final String DECISION_NODE_CN_LABEL_DECISION_INPUT_HINT = "5043"; //$NON-NLS-1$
+
+	public static final String DECISION_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5098"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: FLOW_FINAL_NODE_CN */
+	public static final IHintedType FLOW_FINAL_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006"); //$NON-NLS-1$
+
+	public static final String FLOW_FINAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5082"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: FORK_NODE_CN */
+	public static final IHintedType FORK_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040"); //$NON-NLS-1$
+
+	public static final String FORK_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5100"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: INITIAL_NODE_CN */
+	public static final IHintedType INITIAL_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004"); //$NON-NLS-1$
+
+	public static final String INITIAL_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5080"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: JOIN_NODE_CN */
+	public static final IHintedType JOIN_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041"); //$NON-NLS-1$
+
+	public static final String JOIN_NODE_CN_LABEL_JOIN_SPEC_HINT = "5042"; //$NON-NLS-1$
+
+	public static final String JOIN_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5101"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: LOOP_NODE_CN */
+	public static final IHintedType LOOP_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071"); //$NON-NLS-1$
+
+	public static final String LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "7010"; //$NON-NLS-1$
+
+	public static final String LOOP_NODE_CN_LABEL_KEYWORD_HINT = "5121"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: MERGE_NODE_CN */
+	public static final IHintedType MERGE_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039"); //$NON-NLS-1$
+
+	public static final String MERGE_NODE_CN_LABEL_APPLIED_STEREOTYPE_HINT = "5099"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: SHAPE_NAMED_ELEMENT_CN */
+	public static final IHintedType SHAPE_NAMED_ELEMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085"); //$NON-NLS-1$
+
+	public static final String SHAPE_NAMED_ELEMENT_CN_LABEL_NAME_HINT = "5129"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: ACTIVITY */
+	public static final IHintedType ACTIVITY = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.Activity_2001"); //$NON-NLS-1$
+
+	public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT = "7001"; //$NON-NLS-1$
+
+	public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT = "7002"; //$NON-NLS-1$
+
+	public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT = "7003"; //$NON-NLS-1$
+
+	public static final String ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT = "7004"; //$NON-NLS-1$
+
+	public static final String ACTIVITY_LABEL_NAME_HINT = "5001"; //$NON-NLS-1$
+
+	public static final String ACTIVITY_LABEL_IS_SINGLE_EXECUTION_HINT = "5002"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: SEQUENCE_NODE_CN */
+	public static final IHintedType SEQUENCE_NODE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073"); //$NON-NLS-1$
+
+	public static final String SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT = "7012"; //$NON-NLS-1$
+
+	public static final String SEQUENCE_NODE_CN_LABEL_KEYWORD_HINT = "5123"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: CONSTRAINT_CN */
+	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.Constraint_3112"); //$NON-NLS-1$
+
+	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "5189"; //$NON-NLS-1$
+
+	public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5190"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: COMMENT_ANNOTATED_ELEMENT */
+	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.CommentAnnotatedElement_4006"); //$NON-NLS-1$
+
+	/** ActivityDiagram :: CONTROL_FLOW */
+	public static final IHintedType CONTROL_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004"); //$NON-NLS-1$
+
+	public static final String CONTROL_FLOW_LABEL_NAME_HINT = "6003"; //$NON-NLS-1$
+
+	public static final String CONTROL_FLOW_LABEL_WEIGHT_HINT = "6004"; //$NON-NLS-1$
+
+	public static final String CONTROL_FLOW_LABEL_GUARD_HINT = "6009"; //$NON-NLS-1$
+
+	public static final String CONTROL_FLOW_LABEL_APPLIED_STEREOTYPE_HINT = "6011"; //$NON-NLS-1$
+
+	public static final String CONTROL_FLOW_LABEL_INTERRUPTIBLE_ICON_HINT = "6013"; //$NON-NLS-1$
+
+	/** ActivityDiagram :: ChildLabelNodes */
+	public static final IHintedType ACTIVITY_PARAMETER_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.Parameter_3001"); //$NON-NLS-1$
+
+	public static final IHintedType ACTIVITY_CONSTRAINT_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.activity.Constraint_3002"); //$NON-NLS-1$
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/GraphicalTypeRegistry.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/GraphicalTypeRegistry.java
new file mode 100644
index 00000000000..802529b92c7
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/GraphicalTypeRegistry.java
@@ -0,0 +1,385 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+
+/**
+ * <pre>
+ * This class provides graphical type id (used as View type) for
+ * domain element according to their actual or expected graphical
+ * container type.
+ * </pre>
+ */
+public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
+
+	/** A Set containing all known node graphical types */
+	protected Set<String> knownNodes = new HashSet<String>();
+
+	/** A Set containing all known edge graphical types */
+	protected Set<String> knownEdges = new HashSet<String>();
+
+	/** Default constructor */
+	public GraphicalTypeRegistry() {
+
+		// Fill known edges set
+		knownEdges.add(ElementTypes.CONTROL_FLOW.getSemanticHint());
+		knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint());
+
+		// Fill known nodes set (primary nodes)
+		knownNodes.add(ElementTypes.ACTIVITY_FINAL_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.CALL_BEHAVIOR_ACTION_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.CONDITIONAL_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.DECISION_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.FLOW_FINAL_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.FORK_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.INITIAL_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.JOIN_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.LOOP_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.MERGE_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.SHAPE_NAMED_ELEMENT_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.ACTIVITY.getSemanticHint());
+		knownNodes.add(ElementTypes.SEQUENCE_NODE_CN.getSemanticHint());
+		knownNodes.add(ElementTypes.CONSTRAINT_CN.getSemanticHint());
+
+		// Fill known nodes set (child label nodes)
+		knownNodes.add(ElementTypes.ACTIVITY_PARAMETER_CLN.getSemanticHint());
+		knownNodes.add(ElementTypes.ACTIVITY_CONSTRAINT_CLN.getSemanticHint());
+		knownNodes.add(ElementTypes.ACTIVITY_CONSTRAINT_CLN.getSemanticHint());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getEdgeGraphicalType(final EObject domainElement) {
+
+		String graphicalType = UNDEFINED_TYPE;
+		if(domainElement == null) {
+			return UNDEFINED_TYPE;
+		}
+		if(domainElement instanceof org.eclipse.uml2.uml.ControlFlow) {
+			graphicalType = ElementTypes.CONTROL_FLOW.getSemanticHint();
+		}
+		return graphicalType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getEdgeGraphicalType(final IElementType elementType) {
+		if(elementType instanceof IHintedType) {
+			final String semanticHint = ((IHintedType)elementType).getSemanticHint();
+			return getEdgeGraphicalType(semanticHint);
+		}
+
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getEdgeGraphicalType(final String proposedType) {
+		if(isKnownEdgeType(proposedType)) {
+			return proposedType;
+		}
+
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getNodeGraphicalType(final EObject domainElement, final String containerType) {
+
+		String graphicalType = UNDEFINED_TYPE;
+		if((containerType == null) || (domainElement == null)) {
+			return UNDEFINED_TYPE;
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.ActivityFinalNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // ActivityFinalNode ChildNode
+				graphicalType = ElementTypes.ACTIVITY_FINAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ActivityFinalNode ChildNode
+				graphicalType = ElementTypes.ACTIVITY_FINAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ActivityFinalNode ChildNode
+				graphicalType = ElementTypes.ACTIVITY_FINAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ActivityFinalNode ChildNode
+				graphicalType = ElementTypes.ACTIVITY_FINAL_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.CallBehaviorAction) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // CallBehaviorAction ChildNode
+				graphicalType = ElementTypes.CALL_BEHAVIOR_ACTION_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // CallBehaviorAction ChildNode
+				graphicalType = ElementTypes.CALL_BEHAVIOR_ACTION_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // CallBehaviorAction ChildNode
+				graphicalType = ElementTypes.CALL_BEHAVIOR_ACTION_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // CallBehaviorAction ChildNode
+				graphicalType = ElementTypes.CALL_BEHAVIOR_ACTION_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // Comment ChildNode
+				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // Comment ChildNode
+				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // Comment ChildNode
+				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // Comment ChildNode
+				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.ConditionalNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // ConditionalNode ChildNode
+				graphicalType = ElementTypes.CONDITIONAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ConditionalNode ChildNode
+				graphicalType = ElementTypes.CONDITIONAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ConditionalNode ChildNode
+				graphicalType = ElementTypes.CONDITIONAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ConditionalNode ChildNode
+				graphicalType = ElementTypes.CONDITIONAL_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.DecisionNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // DecisionNode ChildNode
+				graphicalType = ElementTypes.DECISION_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // DecisionNode ChildNode
+				graphicalType = ElementTypes.DECISION_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // DecisionNode ChildNode
+				graphicalType = ElementTypes.DECISION_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // DecisionNode ChildNode
+				graphicalType = ElementTypes.DECISION_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.FlowFinalNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // FlowFinalNode ChildNode
+				graphicalType = ElementTypes.FLOW_FINAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // FlowFinalNode ChildNode
+				graphicalType = ElementTypes.FLOW_FINAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // FlowFinalNode ChildNode
+				graphicalType = ElementTypes.FLOW_FINAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // FlowFinalNode ChildNode
+				graphicalType = ElementTypes.FLOW_FINAL_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.ForkNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // ForkNode ChildNode
+				graphicalType = ElementTypes.FORK_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ForkNode ChildNode
+				graphicalType = ElementTypes.FORK_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ForkNode ChildNode
+				graphicalType = ElementTypes.FORK_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // ForkNode ChildNode
+				graphicalType = ElementTypes.FORK_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.InitialNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // InitialNode ChildNode
+				graphicalType = ElementTypes.INITIAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // InitialNode ChildNode
+				graphicalType = ElementTypes.INITIAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // InitialNode ChildNode
+				graphicalType = ElementTypes.INITIAL_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // InitialNode ChildNode
+				graphicalType = ElementTypes.INITIAL_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.JoinNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // JoinNode ChildNode
+				graphicalType = ElementTypes.JOIN_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // JoinNode ChildNode
+				graphicalType = ElementTypes.JOIN_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // JoinNode ChildNode
+				graphicalType = ElementTypes.JOIN_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // JoinNode ChildNode
+				graphicalType = ElementTypes.JOIN_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.LoopNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // LoopNode ChildNode
+				graphicalType = ElementTypes.LOOP_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // LoopNode ChildNode
+				graphicalType = ElementTypes.LOOP_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // LoopNode ChildNode
+				graphicalType = ElementTypes.LOOP_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // LoopNode ChildNode
+				graphicalType = ElementTypes.LOOP_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.MergeNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // MergeNode ChildNode
+				graphicalType = ElementTypes.MERGE_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // MergeNode ChildNode
+				graphicalType = ElementTypes.MERGE_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // MergeNode ChildNode
+				graphicalType = ElementTypes.MERGE_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // MergeNode ChildNode
+				graphicalType = ElementTypes.MERGE_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.NamedElement) {
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.Activity) {
+			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Activity
+																// TopNode
+				graphicalType = ElementTypes.ACTIVITY.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.SequenceNode) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // SequenceNode ChildNode
+				graphicalType = ElementTypes.SEQUENCE_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // SequenceNode ChildNode
+				graphicalType = ElementTypes.SEQUENCE_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // SequenceNode ChildNode
+				graphicalType = ElementTypes.SEQUENCE_NODE_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // SequenceNode ChildNode
+				graphicalType = ElementTypes.SEQUENCE_NODE_CN.getSemanticHint();
+			}
+
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerType)) { // Constraint ChildNode
+				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // Constraint ChildNode
+				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // Constraint ChildNode
+				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerType)) { // Constraint ChildNode
+				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
+			}
+
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT.equals(containerType)) { // Constraint ChildLabelNode
+				graphicalType = ElementTypes.ACTIVITY_CONSTRAINT_CLN.getSemanticHint();
+			}
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT.equals(containerType)) { // Constraint ChildLabelNode
+				graphicalType = ElementTypes.ACTIVITY_CONSTRAINT_CLN.getSemanticHint();
+			}
+		}
+
+		if(domainElement instanceof org.eclipse.uml2.uml.Parameter) {
+
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT.equals(containerType)) { // Parameter ChildLabelNode
+				graphicalType = ElementTypes.ACTIVITY_PARAMETER_CLN.getSemanticHint();
+			}
+		}
+
+		return graphicalType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getNodeGraphicalType(final IElementType elementType, final String containerType) {
+		if(elementType instanceof IHintedType) {
+			final String semanticHint = ((IHintedType)elementType).getSemanticHint();
+			return getNodeGraphicalType(semanticHint, containerType);
+		}
+
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getNodeGraphicalType(final String proposedType, final String containerType) {
+		if(isKnownNodeType(proposedType)) {
+			return proposedType;
+		}
+
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean isKnownEdgeType(final String type) {
+		return knownEdges.contains(type);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean isKnownNodeType(final String type) {
+		return knownNodes.contains(type);
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/IGraphicalTypeRegistry.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/IGraphicalTypeRegistry.java
new file mode 100644
index 00000000000..f58850cb006
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/IGraphicalTypeRegistry.java
@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+
+/**
+ * This interface provides an API for accessing the local graphical type
+ * registry. This registry provides a graphical type for existing model
+ * elements.
+ */
+public interface IGraphicalTypeRegistry {
+
+	/** Constant for undefined graphical type */
+	public static final String UNDEFINED_TYPE = "undefined_type";
+
+	/**
+	 * Get a valid edge graphical type for the domain element.
+	 * 
+	 * @param domainElement
+	 *        the domain element.
+	 * @return the domain element graphical type.
+	 */
+	public String getEdgeGraphicalType(EObject domainElement);
+
+	/**
+	 * Get a valid edge graphical type for the element type.
+	 * 
+	 * @param elementType
+	 *        the element type.
+	 * @param containerType
+	 *        the type of the graphical owner of the domain element.
+	 * @return the domain element graphical type.
+	 */
+	public String getEdgeGraphicalType(IElementType elementType);
+
+	/**
+	 * Get a valid edge graphical type for the proposed type.
+	 * 
+	 * @param proposedType
+	 *        the proposed type.
+	 * @param containerType
+	 *        the type of the graphical owner of the domain element.
+	 * @return the domain element graphical type.
+	 */
+	public String getEdgeGraphicalType(String proposedType);
+
+	/**
+	 * Get a valid node graphical type for the domain element.
+	 * 
+	 * @param domainElement
+	 *        the domain element.
+	 * @param containerType
+	 *        the type of the graphical owner of the domain element.
+	 * @return the domain element graphical type.
+	 */
+	public String getNodeGraphicalType(EObject domainElement, String containerType);
+
+	/**
+	 * Get a valid node graphical type for the element type.
+	 * 
+	 * @param elementType
+	 *        the element type.
+	 * @param containerType
+	 *        the type of the graphical owner of the domain element.
+	 * @return the domain element graphical type.
+	 */
+	public String getNodeGraphicalType(IElementType elementType, String containerType);
+
+	/**
+	 * Get a valid node graphical type for the proposed type.
+	 * 
+	 * @param proposedType
+	 *        the proposed type.
+	 * @param containerType
+	 *        the type of the graphical owner of the domain element.
+	 * @return the domain element graphical type.
+	 */
+	public String getNodeGraphicalType(String proposedType, String containerType);
+
+	/**
+	 * Test if the type is a known edge graphical type in this diagram
+	 * 
+	 * @param type
+	 *        the type to test
+	 * @return true if the type is known
+	 */
+	public boolean isKnownEdgeType(String type);
+
+	/**
+	 * Test if the type is a known node graphical type in this diagram
+	 * 
+	 * @param type
+	 *        the type to test
+	 * @return true if the type is known
+	 */
+	public boolean isKnownNodeType(String type);
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.java
new file mode 100644
index 00000000000..9fa79ee21e6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramEditPartProvider.java
@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLEditPartProvider;
+
+public class InheritedActivityDiagramEditPartProvider extends CustomUMLEditPartProvider {
+
+	@Override
+	public synchronized boolean provides(final IOperation operation) {
+		if(operation instanceof CreateGraphicEditPartOperation) {
+			final View view = ((IEditPartOperation)operation).getView();
+
+			// Ensure current diagram is a InteractionOverviewDiagram Diagram
+			if(!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
+				return false;
+			}
+
+			// Test supported inherited types
+			final EObject eobject = view.getElement();
+
+			/** Nodes (and ChildLabelNodes) *********** */
+			if(eobject instanceof org.eclipse.uml2.uml.ActivityFinalNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.CallBehaviorAction) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.ConditionalNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.DecisionNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.FlowFinalNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.ForkNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.InitialNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.JoinNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.LoopNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.MergeNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.NamedElement) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.SequenceNode) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
+				return true;
+			}
+			if(eobject instanceof org.eclipse.uml2.uml.Parameter) {
+				return true;
+			}
+
+			/** Edges *********** */
+			if(eobject instanceof org.eclipse.uml2.uml.ControlFlow) {
+				return true;
+			}
+
+			// Additional test needed here to decide whether to support Feature
+			// type links.
+			// As feature type link are not related to a MetaClass from the
+			// domain model
+			// they are not already handled by previous tests.
+			// Also concerns NotationType.
+			final String hint = view.getType();
+
+			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
+			if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
+				return true;
+			}
+
+		}
+		return false;
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.java
new file mode 100644
index 00000000000..0641607717f
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InheritedActivityDiagramViewProvider.java
@@ -0,0 +1,1924 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+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.gmf.runtime.diagram.core.preferences.PreferencesHint;
+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.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLViewProvider;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+
+public class InheritedActivityDiagramViewProvider extends CustomUMLViewProvider {
+
+	/** Local graphical type registry */
+	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
+
+	@Override
+	public Edge createEdge(final IAdaptable semanticAdapter, final View containerView, final String semanticHint, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
+		Edge createdEdge = null;
+
+		final IElementType elementType = (IElementType)semanticAdapter.getAdapter(IElementType.class);
+		if(elementType != null) {
+			createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
+		} else {
+
+			final EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
+
+			String domainElementGraphicalType = semanticHint;
+			if(domainElementGraphicalType == null) {
+				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
+			}
+
+			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+				// Cannot use createEdge from super class as it never take the
+				// graphical type (semanticHint) into account.
+				// createdEdge = super.createEdge(semanticAdapter,
+				// containerView, domainElementGraphicalType, index, persisted,
+				// preferencesHint);
+
+				if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
+					createdEdge = createCommentAnnotatedElement_4006(containerView, index, persisted, preferencesHint);
+				}
+				if(ElementTypes.CONTROL_FLOW.getSemanticHint().equals(domainElementGraphicalType)) {
+					createdEdge = createControlFlow_4004(domainElement, containerView, index, persisted, preferencesHint);
+				}
+			}
+		}
+
+		if(createdEdge == null) {
+			Activator.log.error(new Exception("Could not create Edge."));
+		}
+
+		return createdEdge;
+	}
+
+	@Override
+	protected boolean provides(final CreateViewForKindOperation op) {
+
+		// This provider is registered for InteractionOverviewDiagram Diagram
+		// only
+		final String diagramType = op.getContainerView().getDiagram().getType();
+		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override
+	protected boolean provides(final CreateEdgeViewOperation op) {
+
+		// Must have a container
+		if(op.getContainerView() == null) {
+			return false;
+		}
+
+		// This provider is registered for InteractionOverviewDiagram Diagram
+		// only
+		final String diagramType = op.getContainerView().getDiagram().getType();
+		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+			return false;
+		}
+
+		final IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
+		if(elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
+			return true;
+		}
+		if(elementType == ElementTypes.CONTROL_FLOW) {
+			return true;
+		}
+
+		// /////////////////////////////////////////////////////////////////////
+		// Test possibility to provide a view based on the semantic nature and
+		// its expected container.
+		// /////////////////////////////////////////////////////////////////////
+
+		// IElementType may be null (especially when drop from ModelExplorer).
+		// In such a case, test the semantic EObject instead.
+		if(elementType == null) {
+			final EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+			String domainElementGraphicalType = op.getSemanticHint();
+			if(domainElementGraphicalType == null) {
+				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
+			}
+
+			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	protected boolean provides(final CreateNodeViewOperation op) {
+		// Must have a container
+		if(op.getContainerView() == null) {
+			return false;
+		}
+		// Get the type of the container
+		final String containerGraphicalType = op.getContainerView().getType();
+
+		// This provider is registered for InteractionOverviewDiagram Diagram
+		// only
+		final String diagramType = op.getContainerView().getDiagram().getType();
+		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+			return false;
+		}
+
+		// /////////////////////////////////////////////////////////////////////
+		// Test possibility to provide a view based on the ElementType and its
+		// expected container.
+		// /////////////////////////////////////////////////////////////////////
+
+		final IElementType elementType = (IElementType)op.getSemanticAdapter().getAdapter(IElementType.class);
+		if(elementType == ElementTypes.ACTIVITY_FINAL_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@1b2c55c7
+			// (visualID: 3005, editPartClassName: ActivityFinalNodeEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityFinalNodeItemSemanticEditPolicy,
+			// notationViewFactoryClassName: ActivityFinalNodeViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityFinalNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// ActivityFinalNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// ActivityFinalNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@533dc18
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.CALL_BEHAVIOR_ACTION_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@2c768384
+			// (visualID: 3008, editPartClassName: CallBehaviorActionEditPart,
+			// itemSemanticEditPolicyClassName:
+			// CallBehaviorActionItemSemanticEditPolicy,
+			// notationViewFactoryClassName: CallBehaviorActionViewFactory)
+			// (canonicalEditPolicyClassName:
+			// CallBehaviorActionCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// CallBehaviorActionGraphicalNodeEditPolicy,
+			// createCommandClassName: CallBehaviorActionCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@fb6ae53
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.COMMENT_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@6b8ef251
+			// (visualID: 3080, editPartClassName: CommentEditPartCN,
+			// itemSemanticEditPolicyClassName: CommentItemSemanticEditPolicy,
+			// notationViewFactoryClassName: CommentViewFactory)
+			// (canonicalEditPolicyClassName: CommentCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName: CommentGraphicalNodeEditPolicy,
+			// createCommandClassName: CommentCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@226ed334
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.CONDITIONAL_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@52545b0f
+			// (visualID: 3069, editPartClassName: ConditionalNodeEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeItemSemanticEditPolicy,
+			// notationViewFactoryClassName: ConditionalNodeViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// ConditionalNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// ConditionalNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@19ec0c95
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.DECISION_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@637950d4
+			// (visualID: 3038, editPartClassName: DecisionNodeEditPart,
+			// itemSemanticEditPolicyClassName:
+			// DecisionNodeItemSemanticEditPolicy, notationViewFactoryClassName:
+			// DecisionNodeViewFactory) (canonicalEditPolicyClassName:
+			// DecisionNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// DecisionNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// DecisionNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@582e177e
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.FLOW_FINAL_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@5d34de68
+			// (visualID: 3006, editPartClassName: FlowFinalNodeEditPart,
+			// itemSemanticEditPolicyClassName:
+			// FlowFinalNodeItemSemanticEditPolicy,
+			// notationViewFactoryClassName: FlowFinalNodeViewFactory)
+			// (canonicalEditPolicyClassName: FlowFinalNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// FlowFinalNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// FlowFinalNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@3a087e6c
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.FORK_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@4a03cc69
+			// (visualID: 3040, editPartClassName: ForkNodeEditPart,
+			// itemSemanticEditPolicyClassName: ForkNodeItemSemanticEditPolicy,
+			// notationViewFactoryClassName: ForkNodeViewFactory)
+			// (canonicalEditPolicyClassName: ForkNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// ForkNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// ForkNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@3a40238
+			// (name: ) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.INITIAL_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@7894a07a
+			// (visualID: 3004, editPartClassName: InitialNodeEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InitialNodeItemSemanticEditPolicy, notationViewFactoryClassName:
+			// InitialNodeViewFactory) (canonicalEditPolicyClassName:
+			// InitialNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// InitialNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// InitialNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@48dac66
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.JOIN_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@61f1aec
+			// (visualID: 3041, editPartClassName: JoinNodeEditPart,
+			// itemSemanticEditPolicyClassName: JoinNodeItemSemanticEditPolicy,
+			// notationViewFactoryClassName: JoinNodeViewFactory)
+			// (canonicalEditPolicyClassName: JoinNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// JoinNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// JoinNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@71315edf
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.LOOP_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@59c87ef9
+			// (visualID: 3071, editPartClassName: LoopNodeEditPart,
+			// itemSemanticEditPolicyClassName: LoopNodeItemSemanticEditPolicy,
+			// notationViewFactoryClassName: LoopNodeViewFactory)
+			// (canonicalEditPolicyClassName: LoopNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// LoopNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// LoopNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@604bbc87
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.MERGE_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@3819222f
+			// (visualID: 3039, editPartClassName: MergeNodeEditPart,
+			// itemSemanticEditPolicyClassName: MergeNodeItemSemanticEditPolicy,
+			// notationViewFactoryClassName: MergeNodeViewFactory)
+			// (canonicalEditPolicyClassName: MergeNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// MergeNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// MergeNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@c467475
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.SHAPE_NAMED_ELEMENT_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@c12dc5f
+			// (visualID: 3085, editPartClassName: ShapeNamedElementEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ShapeNamedElementItemSemanticEditPolicy,
+			// notationViewFactoryClassName: null)
+			// (canonicalEditPolicyClassName:
+			// ShapeNamedElementCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// ShapeNamedElementGraphicalNodeEditPolicy, createCommandClassName:
+			// ShapeNamedElementCreateCommand)
+			// containers:
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@6587b39e
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+		}
+		if(elementType == ElementTypes.ACTIVITY) {
+			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.SEQUENCE_NODE_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@37a34401
+			// (visualID: 3073, editPartClassName: SequenceNodeEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeItemSemanticEditPolicy, notationViewFactoryClassName:
+			// SequenceNodeViewFactory) (canonicalEditPolicyClassName:
+			// SequenceNodeCanonicalEditPolicy)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// SequenceNodeGraphicalNodeEditPolicy, createCommandClassName:
+			// SequenceNodeCreateCommand)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@68bbc547
+			// (visualID: 7013, editPartClassName:
+			// ActivityCNContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityCNContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityCNContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@66e0c7d2
+			// (name: null) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.CONSTRAINT_CN) {
+			// node:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@1d69a67
+			// (visualID: 3112, editPartClassName: ConstraintEditPartCN,
+			// itemSemanticEditPolicyClassName:
+			// ConstraintItemSemanticEditPolicyCN, notationViewFactoryClassName:
+			// null) (canonicalEditPolicyClassName:
+			// ConstraintCanonicalEditPolicyCN)
+			// (primaryDragEditPolicyQualifiedClassName: null,
+			// graphicalNodeEditPolicyClassName:
+			// ConstraintGraphicalNodeEditPolicyCN, createCommandClassName:
+			// ConstraintCreateCommandCN)
+			// containers:
+			// org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@db986d8
+			// (visualID: 7004, editPartClassName:
+			// ActivityActivityContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityActivityContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityActivityContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityActivityContentCompartmentCanonicalEditPolicy) (title:
+			// ActivityFigureContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@20266003
+			// (visualID: 7008, editPartClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ConditionalNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7f94ee08
+			// (visualID: 7009, editPartClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ExpansionRegionStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7a083b7b
+			// (visualID: 7010, editPartClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// LoopNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3fc5ba30
+			// (visualID: 7012, editPartClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// SequenceNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@a9790a8
+			// (visualID: 7005, editPartClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// StructuredActivityNodeStructuredActivityNodeContentCompartmentCanonicalEditPolicy)
+			// (title: StructuredActivityNodeContentCompartment, canCollapse:
+			// false, hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@649a0b06
+			// (visualID: 7006, editPartClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// ActivityPartitionActivityPartitionContentCompartmentCanonicalEditPolicy)
+			// (title: ActivityPartitionContentCompartment, canCollapse: false,
+			// hideIfEmpty: true, needsTitle: false, listLayout:
+			// false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3d49ea83
+			// (visualID: 7007, editPartClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart,
+			// itemSemanticEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy,
+			// notationViewFactoryClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentViewFactory)
+			// (canonicalEditPolicyClassName:
+			// InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentCanonicalEditPolicy)
+			// (title: InterruptibleActivityRegionContentCompartment,
+			// canCollapse: false, hideIfEmpty: true, needsTitle: false,
+			// listLayout: false)
+			// nodeRef:
+			// org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@2f5ee0c2
+			// (name: ) (customPreferencePage: null, generatePreferencePage:
+			// true, generateTool: true)
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.CONDITIONAL_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.LOOP_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+			if(ElementTypes.SEQUENCE_NODE_CN_COMPARTMENT_STRUCTURED_ACTIVITY_NODE_CONTENT_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.ACTIVITY_PARAMETER_CLN) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PARAMETER_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.ACTIVITY_CONSTRAINT_CLN) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_PRECONDITION_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+		if(elementType == ElementTypes.ACTIVITY_CONSTRAINT_CLN) {
+			if(ElementTypes.ACTIVITY_COMPARTMENT_ACTIVITY_FIGURE_POST_CONDTION_HINT.equals(containerGraphicalType)) {
+				return true;
+			}
+		}
+
+		// /////////////////////////////////////////////////////////////////////
+		// Test possibility to provide a view based on the semantic nature and
+		// its expected container.
+		// /////////////////////////////////////////////////////////////////////
+
+		// IElementType may be null (especially when drop from ModelExplorer).
+		// In such a case, test the semantic EObject instead.
+		if(elementType == null) {
+			final EObject domainElement = (EObject)op.getSemanticAdapter().getAdapter(EObject.class);
+			String domainElementGraphicalType = op.getSemanticHint();
+			if(domainElementGraphicalType == null) {
+				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
+			} else {
+				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
+			}
+
+			if((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public Node createNode(final IAdaptable semanticAdapter, final View containerView, final String semanticHint, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
+
+		if(semanticHint != null) {
+			return super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
+		}
+
+		// Use the GraphicalTypeRegistry to find the expected type for a domain
+		// element
+		// Get the type of the container
+		final String containerGraphicalType = containerView.getType();
+		// Get the type of the domain element
+		final EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
+		final String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
+
+		// Create the expected node
+		if(!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
+			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
+		}
+
+		Activator.log.error(new Exception("Could not create Node."));
+		return null;
+	}
+
+	@Override
+	protected void stampShortcut(final View containerView, final Node target) {
+		if(!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
+			final EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
+			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
+			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
+			target.getEAnnotations().add(shortcutAnnotation);
+		}
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPartProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPartProvider.java
new file mode 100644
index 00000000000..9f877c5e949
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPartProvider.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLEditPartProvider;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.InteractionOverviewDiagramEditPart;
+
+public class InteractionOverviewDiagramEditPartProvider extends UMLEditPartProvider {
+
+	@Override
+	public boolean provides(final IOperation operation) {
+		if(operation instanceof CreateGraphicEditPartOperation) {
+			final View view = ((IEditPartOperation)operation).getView();
+
+			// Ensure current diagram is InteractionOverviewDiagram Diagram
+			// if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+			return true;
+			// }
+		}
+
+		return false;
+	}
+
+	@Override
+	protected Class<?> getDiagramEditPartClass(final View view) {
+		if(ElementTypes.DIAGRAM_ID.equals(view.getType())) {
+			return InteractionOverviewDiagramEditPart.class;
+		}
+
+		Activator.log.error(new Exception("Could not create EditPart."));
+		return null;
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPolicyProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPolicyProvider.java
new file mode 100644
index 00000000000..835b37ed9d6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramEditPolicyProvider.java
@@ -0,0 +1,110 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+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.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy.InteractionOverviewDiagramDragDropEditPolicy;
+
+public class InteractionOverviewDiagramEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	public boolean provides(final IOperation operation) {
+
+		final CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;
+		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
+			return false;
+		}
+		final GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();
+		final String diagramType = gep.getNotationView().getDiagram().getType();
+		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+			return false;
+		}
+
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityFinalNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.CommentEditPartCN) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConditionalNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConditionalNodeStructuredActivityNodeContentCompartmentEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.DecisionNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.FlowFinalNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ForkNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.InitialNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.JoinNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeStructuredActivityNodeContentCompartmentEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.MergeNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ShapeNamedElementEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityParametersCompartmentEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityPreConditionsCompartmentEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityPostConditionsCompartmentEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.SequenceNodeEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.SequenceNodeStructuredActivityNodeContentCompartmentEditPart) {
+			return true;
+		}
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConstraintEditPartCN) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public void createEditPolicies(final EditPart editPart) {
+		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new InteractionOverviewDiagramDragDropEditPolicy());
+	}
+
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramViewProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramViewProvider.java
new file mode 100644
index 00000000000..f8e8872357f
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/InteractionOverviewDiagramViewProvider.java
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.factory.InteractionOverviewDiagramViewFactory;
+
+public class InteractionOverviewDiagramViewProvider extends AbstractViewProvider {
+
+	@Override
+	protected boolean provides(final CreateDiagramViewOperation operation) {
+
+		if(ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
+			return true;
+		}
+
+		return false;
+	}
+
+	@Override
+	protected Class<?> getDiagramViewClass(final IAdaptable semanticAdapter, final String diagramKind) {
+		if(ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
+			return InteractionOverviewDiagramViewFactory.class;
+		}
+
+		Activator.log.error(new Exception("Could not create View."));
+		return null;
+	}
+}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/CreateInteractionOverviewDiagramWithNavigationHandler.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/CreateInteractionOverviewDiagramWithNavigationHandler.java
new file mode 100644
index 00000000000..3019c616ffb
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/CreateInteractionOverviewDiagramWithNavigationHandler.java
@@ -0,0 +1,21 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview;

+

+import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;

+

+public class CreateInteractionOverviewDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {

+

+	public CreateInteractionOverviewDiagramWithNavigationHandler() {

+		super(new InteractionOverviewDiagramCreateCommand(), new InteractionOverviewDiagramCreationCondition());

+	}

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreationCondition.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreationCondition.java
new file mode 100644
index 00000000000..c9e5056ea02
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/InteractionOverviewDiagramCreationCondition.java
@@ -0,0 +1,33 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview;

+

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

+import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;

+

+/**

+ * PackageDiagramCreationCondition class allows to check if a Class diagram can

+ * be added to the selected element.

+ */

+public class InteractionOverviewDiagramCreationCondition extends PerspectiveContextDependence {

+

+	/**

+	 * @return whether the diagram can be created.

+	 */

+	@Override

+	public boolean create(final EObject selectedElement) {

+		if(super.create(selectedElement)) {

+			return selectedElement instanceof org.eclipse.uml2.uml.Package;

+		}

+		return false;

+	}

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CallBehaviorActionAsInteractionUseCreateCommand.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CallBehaviorActionAsInteractionUseCreateCommand.java
new file mode 100644
index 00000000000..64b6533b603
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/CallBehaviorActionAsInteractionUseCreateCommand.java
@@ -0,0 +1,65 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.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.requests.CreateElementRequest;

+import org.eclipse.jface.dialogs.IDialogConstants;

+import org.eclipse.papyrus.uml.diagram.activity.edit.commands.CallBehaviorActionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.activity.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.dialogs.CreateInteractionUseDialog;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.Behavior;

+import org.eclipse.uml2.uml.CallBehaviorAction;

+import org.eclipse.uml2.uml.UMLFactory;

+

+

+public class CallBehaviorActionAsInteractionUseCreateCommand extends CallBehaviorActionCreateCommand {

+

+

+	public CallBehaviorActionAsInteractionUseCreateCommand(final CreateElementRequest req) {

+		super(req);

+	}

+

+	public CallBehaviorActionAsInteractionUseCreateCommand(final CreateElementRequest req, final EObject eObject) {

+		super(req, eObject);

+	}

+

+	public static CallBehaviorActionAsInteractionUseCreateCommand create(final CreateElementRequest req, final EObject eObject) {

+		return new CallBehaviorActionAsInteractionUseCreateCommand(req, eObject);

+	}

+

+	@Override

+	protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {

+		// get the activity containing the new element

+		Activity parentActivity = null;

+		EObject parent = getElementToEdit();

+		while(parent != null && parentActivity == null) {

+			if(parent instanceof Activity) {

+				parentActivity = (Activity)parent;

+			}

+			parent = parent.eContainer();

+		}

+		final CallBehaviorAction newElement = UMLFactory.eINSTANCE.createCallBehaviorAction();

+		final CreateInteractionUseDialog dialog = new CreateInteractionUseDialog(Display.getDefault().getActiveShell(), parentActivity, newElement);

+		if(IDialogConstants.OK_ID == dialog.open()) {

+			// initialize the invoked element (no need to use a command, since action is being created)

+			final EObject behavior = dialog.getSelectedInvoked();

+			if(behavior instanceof Behavior) {

+				newElement.setBehavior((Behavior)behavior);

+			}

+		} else {

+			return CommandResult.newCancelledCommandResult();

+		}

+		initAndExecuteEmfCommand(newElement);

+		//		Activity owner = (Activity)getElementToEdit();

+		//		owner.getNodes().add(newElement);

+		ElementInitializers.getInstance().init_CallBehaviorAction_3008(newElement);

+		doConfigure(newElement, monitor, info);

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

+		return CommandResult.newOKCommandResult(newElement);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/dialogs/CreateInteractionUseDialog.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/dialogs/CreateInteractionUseDialog.java
new file mode 100644
index 00000000000..47fccb69ce2
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/dialogs/CreateInteractionUseDialog.java
@@ -0,0 +1,173 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.dialogs;

+

+import java.util.Set;

+

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

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

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

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

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.papyrus.uml.diagram.activity.edit.dialogs.CreateInvocationActionDialog;

+import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.part.Messages;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.IInteractionOverviewPreferenceConstants;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.forms.widgets.FormToolkit;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.BehavioredClassifier;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.InteractionUse;

+import org.eclipse.uml2.uml.InvocationAction;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+import com.google.common.collect.Sets;

+

+

+public class CreateInteractionUseDialog extends CreateInvocationActionDialog {

+

+	public CreateInteractionUseDialog(final Shell shell, final Activity owner, final InvocationAction newAction) {

+		super(shell, owner, newAction);

+	}

+

+	/**

+	 * Get the id of the preference storing whether selection is the default

+	 * choice.

+	 * 

+	 * @return preference id

+	 */

+	@Override

+	protected String getSelectionIsDefaultPreference() {

+		return IInteractionOverviewPreferenceConstants.PREF_NEW_INTERACTION_USE_SELECT_AS_DEFAULT;

+	}

+

+	/**

+	 * Get the id of the preference storing the last selected owner.

+	 * 

+	 * @return preference id

+	 */

+	@Override

+	protected String getCreationDefaultOwnerPreference() {

+		return IInteractionOverviewPreferenceConstants.PREF_NEW_INTERACTION_USE_CREATION_OWNER;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.activity.edit.dialogs.CreateInvocationActionDialog#getInvocationCreationSectionTitle()

+	 */

+	@Override

+	protected String getInvocationCreationSectionTitle() {

+		return Messages.CreateCallActionDialog_BehaviorInvocationCreationTitle;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.activity.edit.dialogs.CreateInvocationActionDialog#getInvocationCreationSectionHelp()

+	 */

+	@Override

+	protected String getInvocationCreationSectionHelp() {

+		return Messages.CreateCallActionDialog_BehaviorInvocationCreationHelp;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.activity.edit.dialogs.CreateInvocationActionDialog#getInvocationSelectionSectionTitle()

+	 */

+	@Override

+	protected String getInvocationSelectionSectionTitle() {

+		return Messages.CreateCallActionDialog_BehaviorInvocationSelectionTitle;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * @see org.eclipse.papyrus.uml.diagram.activity.edit.dialogs.CreateCallActionDialog#getTitle()

+	 */

+	@Override

+	protected String getTitle() {

+		return Messages.CreateCallActionDialog_BehaviorTitle;

+	}

+

+	@Override

+	protected EClass[] getPossibleInvokedTypes() {

+		return new EClass[]{ UMLPackage.eINSTANCE.getInteraction() };

+	}

+

+	@Override

+	protected String getCreationLabel() {

+		return Messages.CreateCallActionDialog_CreateBehavior;

+	}

+

+	@Override

+	protected String getSelectionLabel() {

+		return Messages.CreateCallActionDialog_SelectBehavior;

+	}

+

+	@Override

+	protected void createExtraSections(final Composite pParent, final FormToolkit pToolkit) {

+	}

+

+	@Override

+	protected Set<? extends EClassifier> getPossibleInvokedParents(final EObject actionParent) {

+		return Sets.newHashSet(UMLPackage.Literals.PACKAGE, UMLPackage.Literals.BEHAVIORED_CLASSIFIER);

+	}

+

+	@Override

+	protected boolean isPossibleInvokedParent(final EObject parent) {

+		return parent instanceof Package || parent instanceof BehavioredClassifier;

+	}

+

+	@Override

+	protected EReference getInvocationFeature() {

+		return UMLPackage.eINSTANCE.getCallBehaviorAction_Behavior();

+	}

+

+	@Override

+	protected Image getParentImage() {

+		return UMLElementTypes.getImage(UMLPackage.eINSTANCE.getPackage());

+	}

+

+	/**

+	 * Set correctly the invoked object, by creating it if needed. Then,

+	 * notifies that the ok button of this dialog has been pressed.

+	 * 

+	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

+	 * 

+	 */

+	@Override

+	protected void okPressed() {

+		boolean isSelectionSelected = selectionRadio.getSelection();

+		// create element if needed

+		if(!isSelectionSelected) {

+			selectedInvoked = UMLFactory.eINSTANCE.createInteraction();

+			if(selectedInvoked instanceof NamedElement) {

+				((NamedElement)selectedInvoked).setName(selectedName);

+			}

+			addInvokedInParent(selectedParent, selectedInvoked);

+		}

+

+		//InteractionUse

+		InteractionUse interactionUse = UMLFactory.eINSTANCE.createInteractionUse();

+		interactionUse.setRefersTo((Interaction)selectedInvoked);

+		interactionUse.setName("InteractionUse_" + ((Interaction)selectedInvoked).getName());

+

+		addInvokedInParent(selectedInvoked, interactionUse);

+

+

+		// store user choices in preference

+		IPreferenceStore prefStore = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+		// store choice between selection and creation

+		prefStore.setValue(getSelectionIsDefaultPreference(), isSelectionSelected);

+		if(!isSelectionSelected) {

+			// store the owner choice

+			String ressUri = selectedParent.eResource().getURI().toString();

+			String parentURI = selectedParent.eResource().getURIFragment(selectedParent);

+			String prefValue = String.format(MAP_FORMAT, ressUri, parentURI);

+			prefStore.setValue(getCreationDefaultOwnerPreference(), prefValue);

+		}

+		setReturnCode(OK);

+		close();

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomActivityEditPartTN.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomActivityEditPartTN.java
new file mode 100644
index 00000000000..6a505e34481
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomActivityEditPartTN.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part;

+

+import org.eclipse.draw2d.IFigure;

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

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.figures.ActivityAsInteractionFigure;

+

+public class CustomActivityEditPartTN extends ActivityEditPart {

+

+	public CustomActivityEditPartTN(final View view) {

+		super(view);

+		// TODO Auto-generated constructor stub

+	}

+

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new ActivityAsInteractionFigure();

+	}

+

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		//removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

+		//installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityContentCompartmentItemSemanticEditPolicy());

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.java
new file mode 100644
index 00000000000..1c0e413f17d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseEditPartCN.java
@@ -0,0 +1,21 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part;

+

+import org.eclipse.draw2d.IFigure;

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

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionEditPart;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.figures.InteractionUseFigure;

+

+

+public class CustomInteractionUseEditPartCN extends CallBehaviorActionEditPart {

+

+	public CustomInteractionUseEditPartCN(final View view) {

+		super(view);

+		// TODO Auto-generated constructor stub

+	}

+

+	@Override

+	protected IFigure createNodeShape() {

+		return primaryShape = new InteractionUseFigure();

+	}

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.java
new file mode 100644
index 00000000000..09874a7840a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomInteractionUseNameEditPart.java
@@ -0,0 +1,34 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part;

+

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

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

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider;

+

+

+public class CustomInteractionUseNameEditPart extends CallBehaviorActionNameEditPart {

+

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart#getParser()

+	 * 

+	 * @return

+	 */

+

+	IParser customParser;

+

+	@Override

+	public IParser getParser() {

+		if(customParser == null) {

+			customParser = UMLParserProvider.getParser(UMLElementTypes.CallBehaviorAction_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart.VISUAL_ID));

+		}

+		return customParser;

+	}

+

+	public CustomInteractionUseNameEditPart(final View view) {

+		super(view);

+		// TODO Auto-generated constructor stub

+	}

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.java
new file mode 100644
index 00000000000..3d4403391bd
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CustomUMLInteractionOverviewEditPartFactory.java
@@ -0,0 +1,42 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part;

+

+import org.eclipse.gef.EditPart;

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

+import org.eclipse.papyrus.uml.diagram.activity.edit.part.CustomUMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionNameEditPart;

+

+public class CustomUMLInteractionOverviewEditPartFactory extends CustomUMLEditPartFactory {

+

+	@Override

+	public EditPart createEditPart(final EditPart context, final Object model) {

+		if(model instanceof View) {

+			final View view = (View)model;

+			final int visualID = org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry.getVisualID(view);

+			switch(visualID) {

+			case ActivityEditPart.VISUAL_ID:// 2001

+				return new CustomActivityEditPartTN(view);

+			case CallBehaviorActionEditPart.VISUAL_ID:// 3008

+				return new CustomInteractionUseEditPartCN(view);

+			case CallBehaviorActionNameEditPart.VISUAL_ID:

+				return new CustomInteractionUseNameEditPart(view);// 5004

+			default:

+				// when adding cases to this switch, also add the corresponding

+				// IDs in the extension

+				// org.eclipse.gmf.runtime.diagram.ui.editpartProviders

+			}

+		}

+		return super.createEditPart(context, model);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..8045de2fa2c
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/ActivityContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityCNContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class ActivityContentCompartmentItemSemanticEditPolicy extends ActivityCNContentCompartmentItemSemanticEditPolicy {

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityCNContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityCNContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..9b18bedba54
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityCNContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,41 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityCNContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomActivityCNContentCompartmentItemSemanticEditPolicy extends ActivityCNContentCompartmentItemSemanticEditPolicy {

+

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..76edd0b27ae
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy extends ActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy {

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..ca16ab5e3c6
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..83cb7767f2d
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInteractionOverviewDiagramCreationEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInteractionOverviewDiagramCreationEditPolicy.java
new file mode 100644
index 00000000000..f1e907954dd
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInteractionOverviewDiagramCreationEditPolicy.java
@@ -0,0 +1,47 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import java.util.List;

+

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

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.CompoundCommand;

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

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

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

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.part.Messages;

+

+public class CustomInteractionOverviewDiagramCreationEditPolicy extends PapyrusCreationEditPolicy {

+

+	public CustomInteractionOverviewDiagramCreationEditPolicy() {

+	}

+

+	@Override

+	protected Command getCreateCommand(final CreateViewRequest request) {

+		final Command superCommand = super.getCreateCommand(request);

+		final List<? extends ViewDescriptor> viewDescriptors = request.getViewDescriptors();

+		if(request instanceof CreateViewAndElementRequest && viewDescriptors.size() == 1) {

+			final String semanticHint = viewDescriptors.get(0).getSemanticHint();

+			if(Integer.toString(ActivityEditPart.VISUAL_ID).equals(semanticHint)) {

+				final TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(getHost().getModel());

+				final CompoundCommand compoundCommand = new CompoundCommand(Messages.CustomInteractionOverviewDiagramCreationEditPolicy_CreateActivity);

+				compoundCommand.add(superCommand);

+

+				return compoundCommand;

+			}

+		}

+		return superCommand;

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..9ffef818bdc
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,41 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy extends InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy {

+

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..c129ab4b960
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..6a8bcae0038
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..86f9806561a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policies/CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -0,0 +1,40 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies;

+

+import org.eclipse.gef.commands.Command;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionAsInteractionUseCreateCommand;

+

+

+public class CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy extends StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy {

+

+	protected Command getCreateCommand(final CreateElementRequest req) {

+		final IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CallBehaviorAction_3008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CallBehaviorActionAsInteractionUseCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.java
new file mode 100644
index 00000000000..a339a3f9aac
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.java
@@ -0,0 +1,215 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.figures;

+

+import java.util.List;

+

+import org.eclipse.draw2d.AbstractLayout;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.OrderedLayout;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.ToolbarLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.papyrus.uml.diagram.activity.figures.ActivityFigure;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.InteractionFigure;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.LeftToolbarLayout;

+

+public class ActivityAsInteractionFigure extends ActivityFigure {

+

+	private WrappingLabel interactionHeader;

+

+	private RectangleFigure interactionLabelContainer;

+

+	private RectangleFigure interactionContentPane;

+

+	public ActivityAsInteractionFigure() {

+		createContents();

+		this.corner = 0;

+	}

+

+	protected void createContents() {

+		add(createInteractionFigureHeader());

+		add(createContentPane());

+		final int childrenSize = getChildren().size();

+		setLayoutManager(new ActivityLayoutManager());

+	}

+

+	protected RectangleFigure createContentPane() {

+		interactionContentPane = new RectangleFigure();

+		// Margin allow to add message easily

+		interactionContentPane.setBorder(new MarginBorder(5, 5, 5, 5));

+		interactionContentPane.setFill(false);

+		interactionContentPane.setOutline(false);

+

+		return interactionContentPane;

+	}

+

+	protected RectangleFigure createInteractionFigureHeader() {

+		this.interactionHeader = new WrappingLabel() {

+

+			@Override

+			public Dimension getPreferredSize(final int wHint, final int hHint) {

+				final Dimension preferredSize = super.getPreferredSize(wHint, hHint);

+				if(preferredSize.width == 0) {

+					return preferredSize;

+				}

+				return new Dimension(preferredSize.width + 2, preferredSize.height + 2);

+			}

+		};

+

+		final InteractionFigure interactionFigure = new InteractionFigure();

+		interactionFigure.setBorder(new MarginBorder(3, 3, 3, 3));

+		interactionFigure.setLayoutManager(new LeftToolbarLayout());

+		interactionFigure.add(interactionHeader);

+		interactionLabelContainer = new RectangleFigure();

+		interactionLabelContainer.setOutline(false);

+		interactionLabelContainer.setFill(false);

+		interactionLabelContainer.setLayoutManager(new ToolbarLayout(false));

+		interactionLabelContainer.add(interactionFigure, OrderedLayout.ALIGN_CENTER);

+		return interactionLabelContainer;

+	}

+

+	@Override

+	public WrappingLabel getNameLabel() {

+		return interactionHeader;

+	}

+

+	public RectangleFigure getLabelContainer() {

+		return interactionLabelContainer;

+	}

+

+	@Override

+	public RectangleFigure getContentFigure() {

+		return interactionContentPane;

+	}

+

+	/**

+	 * get the gmf container figure of the package

+	 * 

+	 * @return the gmf container

+	 */

+	@Override

+	public ShapeCompartmentFigure getGMFContentContainer() {

+		if(interactionContentPane.getChildren().size() > 0) {

+			return (ShapeCompartmentFigure)interactionContentPane.getChildren().get(0);

+		}

+		return null;

+	}

+

+	/**

+	 * this is the layout manager in charge to place element in the enumeration

+	 * 

+	 */

+	private class ActivityLayoutManager extends AbstractLayout {

+

+		/**

+		 * ---------------------------------------------------| |sterotypeLabel|

+		 * precondition | |--------------| | |QualifiedName

+		 * |-----------------------------------| |--------------| | |name |

+		 * postcondition | |--------------------------------------------------|

+		 * | stereotype compartment |

+		 * |--------------------------------------------------| |parameter | |

+		 * |----------- | | activity content |

+		 * ----------------------------------------------------

+		 * 

+		 * {@inheritDoc}

+		 */

+		@Override

+		protected Dimension calculatePreferredSize(final IFigure container, final int hint, final int hint2) {

+			int minimumWith = 0;

+			int minimumHeight = 0;

+			// take in account the content of the figure activity

+			if((getContentFigure().getChildren().size() > 0)) {

+				final IFigure content = (IFigure)getContentFigure().getChildren().get(0);

+				minimumWith = content.getPreferredSize().width + 50;

+				minimumHeight = content.getPreferredSize().height + 50;

+			}

+			// display name

+			if(getNameLabel() != null) {

+				if(getNameLabel().getPreferredSize().width > minimumWith) {

+					minimumWith = getNameLabel().getPreferredSize().width;

+				}

+				minimumHeight += getNameLabel().getPreferredSize().height;

+			}

+			if(getHeaderSingleExecution() != null) {

+				if(getHeaderSingleExecution().getBounds().getTopRight().x > minimumWith) {

+					minimumWith = getHeaderSingleExecution().getBounds().getTopRight().x;

+				}

+			}

+			return new Dimension(minimumWith, minimumHeight);

+		}

+

+		/**

+		 * 

+		 * {@inheritDoc}

+		 */

+		public void layout(final IFigure container) {

+			final List childrenList = container.getChildren();

+			for(int i = 0; i < container.getChildren().size(); i++) {

+				final IFigure currentFigure = (IFigure)childrenList.get(i);

+				if(currentFigure.equals(getLabelContainer()) || currentFigure.equals(getContentFigure())) {

+					final Rectangle bound = new Rectangle(((IFigure)childrenList.get(i)).getBounds());

+					bound.setSize(((IFigure)childrenList.get(i)).getPreferredSize());

+					if(i > 0) {

+						bound.y = ((IFigure)childrenList.get(i - 1)).getBounds().getBottomLeft().y + 1;

+						// bound.x = getBounds().x + GAP_X;

+					} else {

+						// bound.x = getBounds().x + GAP_X;

+						bound.y = getBounds().y + GAP_Y;

+					}

+					((IFigure)childrenList.get(i)).setBounds(bound);

+				}

+			}

+			// container

+			final Rectangle lastRectangle = getContentFigure().getBounds();

+			lastRectangle.height = getBounds().y + getBounds().height - lastRectangle.y;

+			lastRectangle.x = container.getBounds().x;

+			lastRectangle.width = getBounds().width;

+			getContentFigure().setBounds(lastRectangle);

+			if(getGMFContentContainer() != null) {

+				getGMFContentContainer().setBounds(lastRectangle);

+			}

+

+			// replace compartment stereotype properties

+			if(getStereotypePropertiesContent() != null) {

+				final Rectangle pscontainer = getStereotypePropertiesContent().getBounds().getCopy();

+				if(getPostconditionFigure().getBounds().y + getPostconditionFigure().getBounds().height + GAP_Y > pscontainer.y)

+					pscontainer.y = getPostconditionFigure().getBounds().y + getPostconditionFigure().getBounds().height + GAP_Y;

+				getStereotypePropertiesContent().setBounds(pscontainer);

+			}

+			// // place parameter

+			// // replace compartment stereotype properties

+			// if(getStereotypePropertiesContent() != null) {

+			// Rectangle paramBoundcontainer =

+			// getParameterFigure().getBounds().getCopy();

+			// paramBoundcontainer.y =

+			// getStereotypePropertiesContent().getBounds().getBottomLeft().y;

+			// getParameterFigure().setBounds(paramBoundcontainer);

+			// if(getParameterFigure().getChildren().size() > 0) {

+			// ((IFigure)interactionContentPane.getChildren().get(0)).setBounds(paramBoundcontainer);

+			// }

+			// } else {

+			// Rectangle paramBoundcontainer =

+			// getParameterFigure().getBounds().getCopy();

+			// paramBoundcontainer.y =

+			// getNameLabel().getBounds().getBottomLeft().y;

+			// getParameterFigure().setBounds(paramBoundcontainer);

+			// if(getParameterFigure().getChildren().size() > 0) {

+			// ((IFigure)interactionContentPane.getChildren().get(0)).setBounds(paramBoundcontainer);;

+			// }

+			// }

+		}

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.java
new file mode 100644
index 00000000000..c2c87faac60
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.java
@@ -0,0 +1,128 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.figures;

+

+import java.util.List;

+

+import org.eclipse.draw2d.AbstractLayout;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.MarginBorder;

+import org.eclipse.draw2d.OrderedLayout;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.ToolbarLayout;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.papyrus.uml.diagram.activity.figures.CallBehaviorActionFigure;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.InteractionFigure;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.LeftToolbarLayout;

+

+

+public class InteractionUseFigure extends CallBehaviorActionFigure {

+

+

+	private WrappingLabel interactionHeader;

+

+	private RectangleFigure interactionLabelContainer;

+

+	private RectangleFigure interactionContentPane;

+

+	private WrappingLabel interactionNameLabel;

+

+	public InteractionUseFigure() {

+		createContents();

+		this.corner = 0;

+	}

+

+	protected void createContents() {

+		add(createInteractionFigureHeader());

+		add(createContentPane());

+		setLayoutManager(new InteractionUseLayoutManager());

+	}

+

+	private class InteractionUseLayoutManager extends AbstractLayout {

+

+		public void layout(final IFigure container) {

+			final List childrenList = container.getChildren();

+			for(int i = 0; i < container.getChildren().size(); i++) {

+				final IFigure currentFigure = (IFigure)childrenList.get(i);

+				if(currentFigure.equals(interactionLabelContainer) || currentFigure.equals(interactionContentPane)) {

+					final Rectangle bound = new Rectangle(((IFigure)childrenList.get(i)).getBounds());

+					bound.setSize(((IFigure)childrenList.get(i)).getPreferredSize());

+					if(i > 0) {

+						bound.y = ((IFigure)childrenList.get(i - 1)).getBounds().getBottomLeft().y + 1;

+						// bound.x = getBounds().x + GAP_X;

+					} else {

+						// bound.x = getBounds().x + GAP_X;

+						bound.y = getBounds().y;

+					}

+					((IFigure)childrenList.get(i)).setBounds(bound);

+				}

+			}

+

+		}

+

+		@Override

+		protected Dimension calculatePreferredSize(final IFigure container, final int wHint, final int hHint) {

+			// TODO Auto-generated method stub

+			return null;

+		}

+

+	}

+

+	protected RectangleFigure createContentPane() {

+

+		interactionNameLabel = new WrappingLabel();

+		interactionContentPane = new RectangleFigure();

+		// Margin allow to add message easily

+		interactionContentPane.setBorder(new MarginBorder(5, 5, 5, 5));

+		interactionContentPane.setFill(true);

+		interactionContentPane.setOutline(false);

+		interactionContentPane.setLayoutManager(new CenterLayout());

+		interactionContentPane.add(interactionNameLabel);

+		return interactionContentPane;

+	}

+

+	protected RectangleFigure createInteractionFigureHeader() {

+		this.interactionHeader = new WrappingLabel() {

+

+			@Override

+			public Dimension getPreferredSize(final int wHint, final int hHint) {

+				final Dimension preferredSize = super.getPreferredSize(wHint, hHint);

+				if(preferredSize.width == 0) {

+					return preferredSize;

+				}

+				return new Dimension(preferredSize.width + 2, preferredSize.height + 2);

+			}

+		};

+		interactionHeader.setText("Ref");

+		final InteractionFigure interactionFigure = new InteractionFigure();

+		interactionFigure.setBorder(new MarginBorder(3, 3, 3, 3));

+		interactionFigure.setLayoutManager(new LeftToolbarLayout());

+		interactionFigure.add(interactionHeader);

+		interactionLabelContainer = new RectangleFigure();

+		interactionLabelContainer.setOutline(false);

+		interactionLabelContainer.setFill(false);

+		interactionLabelContainer.setLayoutManager(new ToolbarLayout(false));

+		interactionLabelContainer.add(interactionFigure, OrderedLayout.ALIGN_CENTER);

+		return interactionLabelContainer;

+	}

+

+	@Override

+	public WrappingLabel getNameLabel() {

+		return interactionNameLabel;

+	}

+

+	/**

+	 * get the gmf container figure of the package

+	 * 

+	 * @return the gmf container

+	 */

+	public ShapeCompartmentFigure getGMFContentContainer() {

+		if(interactionContentPane.getChildren().size() > 0) {

+			return (ShapeCompartmentFigure)interactionContentPane.getChildren().get(0);

+		}

+		return null;

+	}

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/parser/CustomCallBehaviorActionParser.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/parser/CustomCallBehaviorActionParser.java
new file mode 100644
index 00000000000..252e7b09f0c
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/parser/CustomCallBehaviorActionParser.java
@@ -0,0 +1,75 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.parser;

+

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

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

+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.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.papyrus.uml.diagram.activity.parser.custom.CallBehaviorActionParser;

+import org.eclipse.uml2.uml.CallBehaviorAction;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.UMLPackage;

+

+

+public class CustomCallBehaviorActionParser extends CallBehaviorActionParser {

+

+	public CustomCallBehaviorActionParser() {

+		super(new EAttribute[]{});

+	}

+

+	@Override

+	public String getPrintString(IAdaptable element, int flags) {

+		Object obj = element.getAdapter(EObject.class);

+		if(obj instanceof CallBehaviorAction) {

+			CallBehaviorAction action = (CallBehaviorAction)obj;

+			String behaviorName = "";

+			if(action.getBehavior() != null && action.getBehavior().getName() != null) {

+				behaviorName = action.getBehavior().getName();

+			}

+			// display behavior name alone if name is not specified differently

+			if(!"".equals(behaviorName)) {

+				return behaviorName;

+			}

+		}

+		return " ";

+	}

+

+	@Override

+	public String getEditString(IAdaptable element, int flags) {

+		Object obj = element.getAdapter(EObject.class);

+		if(obj instanceof CallBehaviorAction) {

+			CallBehaviorAction action = (CallBehaviorAction)obj;

+			String behaviorName = "";

+			if(action.getBehavior() != null && action.getBehavior().getName() != null) {

+				behaviorName = action.getBehavior().getName();

+			}

+			// display behavior name alone if name is not specified differently

+			if(!"".equals(behaviorName)) {

+				return behaviorName;

+			}

+		}

+		return " ";

+	}

+

+	@Override

+	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {

+		if(newString == null) {

+			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$

+		if(element instanceof CallBehaviorAction) {

+			Interaction interactionUse = (Interaction)(((CallBehaviorAction)element).getBehavior());

+			command.compose(getModificationCommand(interactionUse, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));

+		}

+		return command;

+	}

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/Messages.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/Messages.java
new file mode 100644
index 00000000000..5a5658f0065
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/Messages.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.part;

+

+import org.eclipse.osgi.util.NLS;

+

+

+public class Messages extends NLS {

+

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.interactionoverview.messages"; //$NON-NLS-1$

+

+	static {

+		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$

+	}

+

+	private Messages() {

+	}

+

+	public static String CustomInteractionOverviewDiagramCreationEditPolicy_CreateActivity;

+

+	public static String CreateCallActionDialog_BehaviorInvocationCreationTitle;

+

+	public static String CreateCallActionDialog_BehaviorInvocationCreationHelp;

+

+	public static String CreateCallActionDialog_BehaviorInvocationSelectionTitle;

+

+	public static String CreateCallActionDialog_BehaviorTitle;

+

+	public static String CreateCallActionDialog_CreateBehavior;

+

+	public static String CreateCallActionDialog_SelectBehavior;

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.java
new file mode 100644
index 00000000000..03ea891d7c4
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/part/UMLVisualIDRegistry.java
@@ -0,0 +1,41 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.part;

+

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

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

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.InteractionOverviewDiagramEditPart;

+

+public class UMLVisualIDRegistry extends org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry {

+

+	public UMLVisualIDRegistry() {

+		super();

+	}

+

+	public static boolean canCreateNode(final View containerView, final int nodeVisualID) {

+		final String containerModelID = org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry.getModelID(containerView);

+		if(!InteractionOverviewDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+			return false;

+		}

+		int containerVisualID;

+		if(InteractionOverviewDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+			containerVisualID = org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry.getVisualID(containerView);

+		} else {

+			if(containerView instanceof Diagram) {

+				containerVisualID = InteractionOverviewDiagramEditPart.VISUAL_ID;

+			} else {

+				return false;

+			}

+		}

+

+		return false;

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/IInteractionOverviewPreferenceConstants.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/IInteractionOverviewPreferenceConstants.java
new file mode 100644
index 00000000000..6179f337d00
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/IInteractionOverviewPreferenceConstants.java
@@ -0,0 +1,12 @@
+package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;

+

+

+

+public interface IInteractionOverviewPreferenceConstants {

+

+

+	public static final String PREF_NEW_INTERACTION_USE_SELECT_AS_DEFAULT = "org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionUse.CreateDialog.selectAsDefault"; //$NON-NLS-1$

+

+	public static final String PREF_NEW_INTERACTION_USE_CREATION_OWNER = "org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionUse.CreateDialog.owner"; //$NON-NLS-1$

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPartProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPartProvider.java
new file mode 100644
index 00000000000..4fde324859a
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPartProvider.java
@@ -0,0 +1,21 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;

+

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomUMLInteractionOverviewEditPartFactory;

+

+public class CustomEditPartProvider extends InteractionOverviewDiagramEditPartProvider {

+

+	public CustomEditPartProvider() {

+		setFactory(new CustomUMLInteractionOverviewEditPartFactory());

+		setAllowCaching(true);

+	}

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPolicyProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPolicyProvider.java
new file mode 100644
index 00000000000..de032dd72fd
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomEditPolicyProvider.java
@@ -0,0 +1,134 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;

+

+import org.eclipse.gef.EditPart;

+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.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityCNContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityPartitionActivityPartitionContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConditionalNodeStructuredActivityNodeContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionStructuredActivityNodeContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeStructuredActivityNodeContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.SequenceNodeStructuredActivityNodeContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.ActivityContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomActivityCNContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies.CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy;

+

+public class CustomEditPolicyProvider extends InteractionOverviewDiagramEditPolicyProvider {

+

+	@Override

+	public boolean provides(IOperation operation) {

+

+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;

+		if(!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

+			return false;

+		}

+

+		// Make sure this concern Internal Block Diagram only

+		IGraphicalEditPart gep = (IGraphicalEditPart)epOperation.getEditPart();

+		String diagramType = gep.getNotationView().getDiagram().getType();

+		if(!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

+			return false;

+		}

+

+		if(gep instanceof ActivityActivityContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof ActivityCNContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof ActivityPartitionActivityPartitionContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof ConditionalNodeStructuredActivityNodeContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof ExpansionRegionStructuredActivityNodeContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof LoopNodeStructuredActivityNodeContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof SequenceNodeStructuredActivityNodeContentCompartmentEditPart) {

+			return true;

+		}

+

+		if(gep instanceof StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart) {

+			return true;

+		}

+

+		return super.provides(operation);

+	}

+

+	@Override

+	public void createEditPolicies(EditPart editPart) {

+		super.createEditPolicies(editPart);

+

+		if(editPart instanceof ActivityActivityContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof ActivityCNContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomActivityCNContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof ActivityPartitionActivityPartitionContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomActivityPartitionActivityPartitionContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof ConditionalNodeStructuredActivityNodeContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof ExpansionRegionStructuredActivityNodeContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomInterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof LoopNodeStructuredActivityNodeContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomLoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof SequenceNodeStructuredActivityNodeContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomSequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy());

+		}

+

+		if(editPart instanceof StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart) {

+			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomStructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy());

+		}

+	}

+

+}

diff --git a/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.java b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.java
new file mode 100644
index 00000000000..d6164984974
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/provider/CustomViewProvider.java
@@ -0,0 +1,15 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.interactionoverview.provider;

+

+public class CustomViewProvider extends InteractionOverviewDiagramViewProvider {

+

+}